Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Dependencies for Arrow's Azure Filesystem #1431

Merged
merged 4 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ aws_crt_cpp:
- 0.26.12
aws_sdk_cpp:
- 1.11.329
azure_core_cpp:
- 1.12.0
azure_identity_cpp:
- 1.8.0
azure_storage_blobs_cpp:
- 12.11.0
azure_storage_files_datalake_cpp:
- 12.10.0
bzip2:
- '1'
c_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ aws_crt_cpp:
- 0.26.12
aws_sdk_cpp:
- 1.11.329
azure_core_cpp:
- 1.12.0
azure_identity_cpp:
- 1.8.0
azure_storage_blobs_cpp:
- 12.11.0
azure_storage_files_datalake_cpp:
- 12.10.0
bzip2:
- '1'
c_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ aws_crt_cpp:
- 0.26.12
aws_sdk_cpp:
- 1.11.329
azure_core_cpp:
- 1.12.0
azure_identity_cpp:
- 1.8.0
azure_storage_blobs_cpp:
- 12.11.0
azure_storage_files_datalake_cpp:
- 12.10.0
bzip2:
- '1'
c_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ aws_crt_cpp:
- 0.26.12
aws_sdk_cpp:
- 1.11.329
azure_core_cpp:
- 1.12.0
azure_identity_cpp:
- 1.8.0
azure_storage_blobs_cpp:
- 12.11.0
azure_storage_files_datalake_cpp:
- 12.10.0
bzip2:
- '1'
c_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ aws_crt_cpp:
- 0.26.12
aws_sdk_cpp:
- 1.11.329
azure_core_cpp:
- 1.12.0
azure_identity_cpp:
- 1.8.0
azure_storage_blobs_cpp:
- 12.11.0
azure_storage_files_datalake_cpp:
- 12.10.0
bzip2:
- '1'
c_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ aws_crt_cpp:
- 0.26.12
aws_sdk_cpp:
- 1.11.329
azure_core_cpp:
- 1.12.0
azure_identity_cpp:
- 1.8.0
azure_storage_blobs_cpp:
- 12.11.0
azure_storage_files_datalake_cpp:
- 12.10.0
bzip2:
- '1'
c_compiler:
Expand Down
21 changes: 21 additions & 0 deletions .ci_support/migrations/azure_core_cpp1120.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
migrator_ts: 1718824596
__migrator:
kind: version
migration_number: 1
bump_number: 1
commit_message: Pin azure-core-cpp 1.12.0

azure_core_cpp:
- 1.12.0
azure_identity_cpp:
- 1.8.0
azure_storage_blobs_cpp:
- 12.11.0
azure_storage_common_cpp:
- 12.6.0
azure_storage_files_datalake_cpp:
- 12.10.0
azure_storage_files_shares_cpp:
- 12.9.0
azure_storage_queues_cpp:
- 12.2.0
8 changes: 8 additions & 0 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ aws_crt_cpp:
- 0.26.12
aws_sdk_cpp:
- 1.11.329
azure_core_cpp:
- 1.12.0
azure_identity_cpp:
- 1.8.0
azure_storage_blobs_cpp:
- 12.11.0
azure_storage_files_datalake_cpp:
- 12.10.0
bzip2:
- '1'
c_compiler:
Expand Down
8 changes: 8 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ aws_crt_cpp:
- 0.26.12
aws_sdk_cpp:
- 1.11.329
azure_core_cpp:
- 1.12.0
azure_identity_cpp:
- 1.8.0
azure_storage_blobs_cpp:
- 12.11.0
azure_storage_files_datalake_cpp:
- 12.10.0
bzip2:
- '1'
c_compiler:
Expand Down
8 changes: 4 additions & 4 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ if "%cuda_compiler_version%"=="None" (
set "EXTRA_CMAKE_ARGS=-DARROW_CUDA=ON"
)

:: # reusable variable for dependencies we cannot yet unvendor
:: # reusable variable for dependencies we cannot yet enable
set "READ_RECIPE_META_YAML_WHY_NOT=OFF"

:: for available switches see
:: https://github.com/apache/arrow/blame/apache-arrow-12.0.0/cpp/cmake_modules/DefineOptions.cmake
cmake -G "Ninja" ^
-DARROW_ACERO=ON ^
-DARROW_AZURE=%READ_RECIPE_META_YAML_WHY_NOT% ^
-DARROW_BOOST_USE_SHARED:BOOL=ON ^
-DARROW_BUILD_STATIC:BOOL=OFF ^
-DARROW_BUILD_TESTS:BOOL=OFF ^
Expand Down
1 change: 1 addition & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export READ_RECIPE_META_YAML_WHY_NOT=OFF
# placeholder in ARROW_GDB_INSTALL_DIR must match _la_placeholder in activate.sh
cmake -GNinja \
-DARROW_ACERO=ON \
-DARROW_AZURE=ON \
-DARROW_BOOST_USE_SHARED=ON \
-DARROW_BUILD_BENCHMARKS=OFF \
-DARROW_BUILD_STATIC=OFF \
Expand Down
12 changes: 11 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ source:
folder: testing

build:
number: 9
number: 10
# for cuda support, building with one version is enough to be compatible with
# all later versions, since arrow is only using libcuda, and not libcudart.
skip: true # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]
Expand Down Expand Up @@ -58,6 +58,12 @@ requirements:
- llvmdev {{ llvm_version }}
- aws-crt-cpp
- aws-sdk-cpp
# azure filesystem dependencies, currently broken on windows, see
# https://github.com/apache/arrow/issues/41990
- azure-core-cpp # [unix]
- azure-identity-cpp # [unix]
- azure-storage-blobs-cpp # [unix]
- azure-storage-files-datalake-cpp # [unix]
- brotli
- bzip2
# not yet: https://github.com/conda-forge/cpp-opentelemetry-sdk-feedstock/issues/38
Expand Down Expand Up @@ -186,6 +192,10 @@ outputs:
host:
- aws-crt-cpp
- aws-sdk-cpp
- azure-core-cpp # [unix]
- azure-identity-cpp # [unix]
- azure-storage-blobs-cpp # [unix]
- azure-storage-files-datalake-cpp # [unix]
- brotli
- bzip2
# not yet: https://github.com/conda-forge/cpp-opentelemetry-sdk-feedstock/issues/38
Expand Down
Loading