From 584f3f43878d514d59c6d47ece447c015da23d9c Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 3 Dec 2021 18:42:56 +0000 Subject: [PATCH 01/18] ARROW-14506: [C++] Conda support for google-cloud-cpp This PR adds support for `google-cloud-cpp` to the Conda files. Probably the most difficult change to grok is the change to compile with C++17 when using Conda: - Conda defaults all its builds to C++17, [this bug](https://github.com/conda/conda-build/issues/3375) goes into some detail as to why. - Arrow defaults to C++11 if no `CMAKE_CXX_STANDARD` argument is provided. - Abseil's ABI changes when used from C++11 vs. C++17, see https://github.com/abseil/abseil-cpp/issues/696 - Therefore, one must compile with C++17 to use Abseil in Conda. - And because `google-cloud-cpp` has a direct dependency on Abseil, exposed through the headers, one must use C++17 to use `google-cloud-cpp` too. --- ci/conda_env_cpp.txt | 4 ++++ ci/docker/conda-cpp.dockerfile | 9 ++++++--- ci/scripts/cpp_build.sh | 1 + dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh | 1 + dev/tasks/conda-recipes/arrow-cpp/meta.yaml | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ci/conda_env_cpp.txt b/ci/conda_env_cpp.txt index cd7136cebbd..435e08d7166 100644 --- a/ci/conda_env_cpp.txt +++ b/ci/conda_env_cpp.txt @@ -25,6 +25,7 @@ cmake gflags glog gmock>=1.10.0 +google-cloud-cpp>=1.34.0 grpc-cpp>=1.27.3 gtest>=1.10.0 libprotobuf @@ -32,6 +33,9 @@ libutf8proc lz4-c make ninja +# Required by google-cloud-cpp, the Conda package is missing the dependency: +# https://github.com/conda-forge/google-cloud-cpp-feedstock/issues/28 +nlohmann_json pkg-config python rapidjson diff --git a/ci/docker/conda-cpp.dockerfile b/ci/docker/conda-cpp.dockerfile index 9363e67f796..5769594b1cd 100644 --- a/ci/docker/conda-cpp.dockerfile +++ b/ci/docker/conda-cpp.dockerfile @@ -22,9 +22,6 @@ FROM ${repo}:${arch}-conda COPY ci/scripts/install_minio.sh /arrow/ci/scripts RUN /arrow/ci/scripts/install_minio.sh latest /opt/conda -COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts -RUN /arrow/ci/scripts/install_gcs_testbench.sh default - # install the required conda packages into the test environment COPY ci/conda_env_cpp.txt \ ci/conda_env_gandiva.txt \ @@ -37,12 +34,17 @@ RUN mamba install \ valgrind && \ mamba clean --all +# We want to install the GCS testbench using the same Python binary that the Conda code will use. +COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts +RUN /arrow/ci/scripts/install_gcs_testbench.sh default + ENV ARROW_BUILD_TESTS=ON \ ARROW_DATASET=ON \ ARROW_DEPENDENCY_SOURCE=CONDA \ ARROW_FLIGHT=ON \ ARROW_FLIGHT_SQL=ON \ ARROW_GANDIVA=ON \ + ARROW_GCS=ON \ ARROW_HOME=$CONDA_PREFIX \ ARROW_ORC=ON \ ARROW_PARQUET=ON \ @@ -55,6 +57,7 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_SNAPPY=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ + CMAKE_CXX_STANDARD=17 \ GTest_SOURCE=BUNDLED \ PARQUET_BUILD_EXAMPLES=ON \ PARQUET_BUILD_EXECUTABLES=ON \ diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh index 5b4bcb48477..39032bb2183 100755 --- a/ci/scripts/cpp_build.sh +++ b/ci/scripts/cpp_build.sh @@ -135,6 +135,7 @@ cmake \ -DCMAKE_BUILD_TYPE=${ARROW_BUILD_TYPE:-debug} \ -DCMAKE_C_FLAGS="${CFLAGS:-}" \ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-}" \ + -DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-11}" \ -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR:-lib} \ -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-${ARROW_HOME}} \ -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \ diff --git a/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh b/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh index 9e4c02c5c6e..814c8d72c1b 100644 --- a/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh +++ b/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh @@ -58,6 +58,7 @@ cmake \ -DARROW_DEPENDENCY_SOURCE=SYSTEM \ -DARROW_FLIGHT=ON \ -DARROW_FLIGHT_REQUIRE_TLSCREDENTIALSOPTIONS=ON \ + -DARROW_GCS=ON \ -DARROW_HDFS=ON \ -DARROW_JEMALLOC=ON \ -DARROW_MIMALLOC=ON \ diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml index 48a8629866d..44913c44543 100644 --- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml +++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml @@ -73,6 +73,7 @@ outputs: - c-ares - gflags - glog + - google-cloud-cpp >=1.34.0 - grpc-cpp - libprotobuf - clangdev 10 # [not (osx and arm64)] From c0ef3c5c0031483b8d3ca9c60f01c539683b6211 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 23 Jan 2022 15:41:52 +0100 Subject: [PATCH 02/18] Use mambabuild --- ...on10.2numpy1.17python3.6.____cpython.yaml} | 2 +- ...on10.2numpy1.17python3.7.____cpython.yaml} | 2 +- ...on10.2numpy1.17python3.8.____cpython.yaml} | 2 +- ...ion10.2numpy1.18python3.7.____cpython.yaml | 57 +++++++++++++++++++ ...ion10.2numpy1.18python3.8.____cpython.yaml | 57 +++++++++++++++++++ ...ion10.2numpy1.19python3.9.____cpython.yaml | 57 +++++++++++++++++++ ...on10.2numpy1.21python3.10.____cpython.yaml | 57 +++++++++++++++++++ ...ionNonenumpy1.18python3.7.____cpython.yaml | 57 +++++++++++++++++++ ...ionNonenumpy1.18python3.8.____cpython.yaml | 57 +++++++++++++++++++ ...ionNonenumpy1.19python3.9.____cpython.yaml | 14 +++-- ...onNonenumpy1.21python3.10.____cpython.yaml | 57 +++++++++++++++++++ dev/tasks/conda-recipes/build_steps.sh | 6 +- 12 files changed, 413 insertions(+), 12 deletions(-) rename dev/tasks/conda-recipes/.ci_support/{win_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml => win_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml} (98%) rename dev/tasks/conda-recipes/.ci_support/{win_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml => win_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml} (98%) rename dev/tasks/conda-recipes/.ci_support/{win_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml => win_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml} (98%) create mode 100644 dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.7.____cpython.yaml create mode 100644 dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.8.____cpython.yaml create mode 100644 dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml create mode 100644 dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml create mode 100644 dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython.yaml create mode 100644 dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.8.____cpython.yaml create mode 100644 dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml similarity index 98% rename from dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml index 8d4e25167b0..49638f362f7 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- None +- '10.2' cxx_compiler: - vs2017 gflags: diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml similarity index 98% rename from dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml index 8da4a8380b7..bb70b36bebd 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- None +- '10.2' cxx_compiler: - vs2017 gflags: diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml similarity index 98% rename from dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml index 1980e1be39b..a631dd8c39c 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- None +- '10.2' cxx_compiler: - vs2017 gflags: diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.7.____cpython.yaml new file mode 100644 index 00000000000..6a740535900 --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.7.____cpython.yaml @@ -0,0 +1,57 @@ +aws_sdk_cpp: +- 1.9.120 +bzip2: +- '1' +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '10.2' +cxx_compiler: +- vs2017 +gflags: +- '2.2' +glog: +- '0.5' +grpc_cpp: +- '1.40' +libprotobuf: +- '3.18' +lz4_c: +- 1.9.3 +numpy: +- '1.18' +openssl: +- 1.1.1 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.7.* *_cpython +re2: +- 2021.09.01 +snappy: +- '1' +target_platform: +- win-64 +thrift_cpp: +- 0.15.0 +zip_keys: +- - numpy + - python +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.8.____cpython.yaml new file mode 100644 index 00000000000..3e86c49a9ba --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.8.____cpython.yaml @@ -0,0 +1,57 @@ +aws_sdk_cpp: +- 1.9.120 +bzip2: +- '1' +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '10.2' +cxx_compiler: +- vs2017 +gflags: +- '2.2' +glog: +- '0.5' +grpc_cpp: +- '1.40' +libprotobuf: +- '3.18' +lz4_c: +- 1.9.3 +numpy: +- '1.18' +openssl: +- 1.1.1 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.8.* *_cpython +re2: +- 2021.09.01 +snappy: +- '1' +target_platform: +- win-64 +thrift_cpp: +- 0.15.0 +zip_keys: +- - numpy + - python +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml new file mode 100644 index 00000000000..da5cc7239b1 --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml @@ -0,0 +1,57 @@ +aws_sdk_cpp: +- 1.9.120 +bzip2: +- '1' +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '10.2' +cxx_compiler: +- vs2017 +gflags: +- '2.2' +glog: +- '0.5' +grpc_cpp: +- '1.40' +libprotobuf: +- '3.18' +lz4_c: +- 1.9.3 +numpy: +- '1.19' +openssl: +- 1.1.1 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.9.* *_cpython +re2: +- 2021.09.01 +snappy: +- '1' +target_platform: +- win-64 +thrift_cpp: +- 0.15.0 +zip_keys: +- - numpy + - python +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml new file mode 100644 index 00000000000..f16a14b8d5b --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,57 @@ +aws_sdk_cpp: +- 1.9.120 +bzip2: +- '1' +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '10.2' +cxx_compiler: +- vs2017 +gflags: +- '2.2' +glog: +- '0.5' +grpc_cpp: +- '1.40' +libprotobuf: +- '3.18' +lz4_c: +- 1.9.3 +numpy: +- '1.21' +openssl: +- 1.1.1 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +re2: +- 2021.09.01 +snappy: +- '1' +target_platform: +- win-64 +thrift_cpp: +- 0.15.0 +zip_keys: +- - numpy + - python +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython.yaml new file mode 100644 index 00000000000..a8bea46e6d1 --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython.yaml @@ -0,0 +1,57 @@ +aws_sdk_cpp: +- 1.9.120 +bzip2: +- '1' +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- None +cxx_compiler: +- vs2017 +gflags: +- '2.2' +glog: +- '0.5' +grpc_cpp: +- '1.40' +libprotobuf: +- '3.18' +lz4_c: +- 1.9.3 +numpy: +- '1.18' +openssl: +- 1.1.1 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.7.* *_cpython +re2: +- 2021.09.01 +snappy: +- '1' +target_platform: +- win-64 +thrift_cpp: +- 0.15.0 +zip_keys: +- - numpy + - python +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.8.____cpython.yaml new file mode 100644 index 00000000000..093f5b4310e --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.8.____cpython.yaml @@ -0,0 +1,57 @@ +aws_sdk_cpp: +- 1.9.120 +bzip2: +- '1' +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- None +cxx_compiler: +- vs2017 +gflags: +- '2.2' +glog: +- '0.5' +grpc_cpp: +- '1.40' +libprotobuf: +- '3.18' +lz4_c: +- 1.9.3 +numpy: +- '1.18' +openssl: +- 1.1.1 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.8.* *_cpython +re2: +- 2021.09.01 +snappy: +- '1' +target_platform: +- win-64 +thrift_cpp: +- 0.15.0 +zip_keys: +- - numpy + - python +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml index 1106037d36b..34016eaba72 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml @@ -1,11 +1,11 @@ aws_sdk_cpp: -- 1.8.186 +- 1.9.120 bzip2: - '1' c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -19,13 +19,15 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.38' +- '1.40' libprotobuf: -- '3.16' +- '3.18' lz4_c: - 1.9.3 numpy: - '1.19' +openssl: +- 1.1.1 pin_run_as_build: bzip2: max_pin: x @@ -39,13 +41,13 @@ pin_run_as_build: python: - 3.9.* *_cpython re2: -- 2021.06.01 +- 2021.09.01 snappy: - '1' target_platform: - win-64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - numpy - python diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml new file mode 100644 index 00000000000..b42cc3efb4c --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml @@ -0,0 +1,57 @@ +aws_sdk_cpp: +- 1.9.120 +bzip2: +- '1' +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- None +cxx_compiler: +- vs2017 +gflags: +- '2.2' +glog: +- '0.5' +grpc_cpp: +- '1.40' +libprotobuf: +- '3.18' +lz4_c: +- 1.9.3 +numpy: +- '1.21' +openssl: +- 1.1.1 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +re2: +- 2021.09.01 +snappy: +- '1' +target_platform: +- win-64 +thrift_cpp: +- 0.15.0 +zip_keys: +- - numpy + - python +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/dev/tasks/conda-recipes/build_steps.sh b/dev/tasks/conda-recipes/build_steps.sh index 25864c08a70..b561ecfdc86 100755 --- a/dev/tasks/conda-recipes/build_steps.sh +++ b/dev/tasks/conda-recipes/build_steps.sh @@ -25,7 +25,7 @@ conda-build: CONDARC -conda install --yes --quiet conda-forge-ci-setup=3 conda-build pip -c conda-forge +conda install --yes --quiet conda-forge-ci-setup=3 conda-build boa pip -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${FEEDSTOCK_ROOT}" "${CONFIG_FILE}" @@ -37,7 +37,7 @@ make_build_number "${FEEDSTOCK_ROOT}" "${FEEDSTOCK_ROOT}" "${CONFIG_FILE}" export CONDA_BLD_PATH="${output_dir}" -conda build \ +conda mambabuild \ "${FEEDSTOCK_ROOT}/arrow-cpp" \ "${FEEDSTOCK_ROOT}/parquet-cpp" \ -m "${CI_SUPPORT}/${CONFIG}.yaml" \ @@ -45,7 +45,7 @@ conda build \ --output-folder "${output_dir}" if [ ! -z "${R_CONFIG:-}" ]; then - conda build \ + conda mambabuild \ "${FEEDSTOCK_ROOT}/r-arrow" \ -m "${CI_SUPPORT}/r/${R_CONFIG}.yaml" \ --output-folder "${output_dir}" From 7f3f56722864074e45754c6217b75b1c9e1ca178 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 23 Jan 2022 16:20:44 +0100 Subject: [PATCH 03/18] Update conda configs --- ...rsion7numpy1.18python3.7.____cpython.yaml} | 26 +++--- ...rsion7numpy1.18python3.8.____cpython.yaml} | 26 +++--- ...rsion7numpy1.19python3.9.____cpython.yaml} | 24 +++--- ...sion7numpy1.21python3.10.____cpython.yaml} | 28 +++---- ...rsion9numpy1.18python3.7.____cpython.yaml} | 22 ++--- ...rsion9numpy1.18python3.8.____cpython.yaml} | 22 ++--- ...rsion9numpy1.19python3.9.____cpython.yaml} | 20 ++--- ...sion9numpy1.21python3.10.____cpython.yaml} | 24 +++--- ...rch64_numpy1.18python3.7.____cpython.yaml} | 21 ++--- ...rch64_numpy1.18python3.8.____cpython.yaml} | 21 ++--- ...arch64_numpy1.19python3.9.____cpython.yaml | 19 +++-- ...ch64_numpy1.21python3.10.____cpython.yaml} | 23 +++--- ...pc64le_numpy1.18python3.7.____cpython.yaml | 68 ++++++++++++++++ ...pc64le_numpy1.18python3.8.____cpython.yaml | 68 ++++++++++++++++ ...pc64le_numpy1.19python3.9.____cpython.yaml | 68 ++++++++++++++++ ...c64le_numpy1.21python3.10.____cpython.yaml | 68 ++++++++++++++++ ...sx_64_numpy1.18python3.7.____cpython.yaml} | 18 ++--- ...sx_64_numpy1.18python3.8.____cpython.yaml} | 18 ++--- ...osx_64_numpy1.19python3.9.____cpython.yaml | 16 ++-- ...x_64_numpy1.21python3.10.____cpython.yaml} | 20 ++--- ...arm64_numpy1.19python3.8.____cpython.yaml} | 16 ++-- ...arm64_numpy1.19python3.9.____cpython.yaml} | 16 ++-- ...arm64_numpy1.21python3.10.____cpython.yaml | 65 +++++++++++++++ ...ion10.2numpy1.17python3.6.____cpython.yaml | 55 ------------- ...ion10.2numpy1.17python3.7.____cpython.yaml | 55 ------------- ...ion10.2numpy1.17python3.8.____cpython.yaml | 55 ------------- ...ion10.2numpy1.18python3.7.____cpython.yaml | 12 ++- ...ion10.2numpy1.18python3.8.____cpython.yaml | 12 ++- ...ion10.2numpy1.19python3.9.____cpython.yaml | 12 ++- ...on10.2numpy1.21python3.10.____cpython.yaml | 12 ++- ...ionNonenumpy1.18python3.7.____cpython.yaml | 12 ++- ...ionNonenumpy1.18python3.8.____cpython.yaml | 12 ++- ...ionNonenumpy1.19python3.9.____cpython.yaml | 12 ++- ...onNonenumpy1.21python3.10.____cpython.yaml | 12 ++- dev/tasks/tasks.yml | 80 +++++++++++++++---- 35 files changed, 636 insertions(+), 422 deletions(-) rename dev/tasks/conda-recipes/.ci_support/{linux_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml => linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.18python3.7.____cpython.yaml} (78%) rename dev/tasks/conda-recipes/.ci_support/{linux_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml => linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.18python3.8.____cpython.yaml} (78%) rename dev/tasks/conda-recipes/.ci_support/{linux_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml => linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.19python3.9.____cpython.yaml} (79%) rename dev/tasks/conda-recipes/.ci_support/{linux_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml => linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpython.yaml} (76%) rename dev/tasks/conda-recipes/.ci_support/{linux_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.7.____cpython.yaml} (80%) rename dev/tasks/conda-recipes/.ci_support/{linux_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.8.____cpython.yaml} (80%) rename dev/tasks/conda-recipes/.ci_support/{linux_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.19python3.9.____cpython.yaml} (81%) rename dev/tasks/conda-recipes/.ci_support/{linux_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml => linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.21python3.10.____cpython.yaml} (78%) rename dev/tasks/conda-recipes/.ci_support/{linux_aarch64_numpy1.17python3.7.____cpython.yaml => linux_aarch64_numpy1.18python3.7.____cpython.yaml} (80%) rename dev/tasks/conda-recipes/.ci_support/{linux_aarch64_numpy1.17python3.8.____cpython.yaml => linux_aarch64_numpy1.18python3.8.____cpython.yaml} (80%) rename dev/tasks/conda-recipes/.ci_support/{linux_aarch64_numpy1.17python3.6.____cpython.yaml => linux_aarch64_numpy1.21python3.10.____cpython.yaml} (78%) create mode 100644 dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml create mode 100644 dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml create mode 100644 dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml create mode 100644 dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml rename dev/tasks/conda-recipes/.ci_support/{osx_64_numpy1.17python3.7.____cpython.yaml => osx_64_numpy1.18python3.7.____cpython.yaml} (86%) rename dev/tasks/conda-recipes/.ci_support/{osx_64_numpy1.17python3.8.____cpython.yaml => osx_64_numpy1.18python3.8.____cpython.yaml} (86%) rename dev/tasks/conda-recipes/.ci_support/{osx_64_numpy1.17python3.6.____cpython.yaml => osx_64_numpy1.21python3.10.____cpython.yaml} (84%) rename dev/tasks/conda-recipes/.ci_support/{osx_arm64_python3.8.____cpython.yaml => osx_arm64_numpy1.19python3.8.____cpython.yaml} (86%) rename dev/tasks/conda-recipes/.ci_support/{osx_arm64_python3.9.____cpython.yaml => osx_arm64_numpy1.19python3.9.____cpython.yaml} (86%) create mode 100644 dev/tasks/conda-recipes/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml delete mode 100644 dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml delete mode 100644 dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml delete mode 100644 dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml diff --git a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.18python3.7.____cpython.yaml similarity index 78% rename from dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.18python3.7.____cpython.yaml index 3416b952c90..4273c9b23a1 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.18python3.7.____cpython.yaml @@ -1,15 +1,13 @@ -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '9' +- '7' cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -19,23 +17,25 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '7' docker_image: -- quay.io/condaforge/linux-anvil-cuda:10.2 +- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 gflags: - '2.2' glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 numpy: -- '1.17' +- '1.18' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -49,17 +49,17 @@ pin_run_as_build: python: - 3.7.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - linux-64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version -- - cuda_compiler_version + - cuda_compiler_version - cdt_name - docker_image - - python diff --git a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.18python3.8.____cpython.yaml similarity index 78% rename from dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.18python3.8.____cpython.yaml index f819ba7229e..7108ddfb8d1 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.18python3.8.____cpython.yaml @@ -1,15 +1,13 @@ -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '9' +- '7' cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -19,23 +17,25 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '7' docker_image: -- quay.io/condaforge/linux-anvil-cuda:10.2 +- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 gflags: - '2.2' glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 numpy: -- '1.17' +- '1.18' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -49,17 +49,17 @@ pin_run_as_build: python: - 3.8.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - linux-64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version -- - cuda_compiler_version + - cuda_compiler_version - cdt_name - docker_image - - python diff --git a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.19python3.9.____cpython.yaml similarity index 79% rename from dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.19python3.9.____cpython.yaml index 3e2e0ef51fb..b5ffa56a72b 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.19python3.9.____cpython.yaml @@ -1,15 +1,13 @@ -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '9' +- '7' cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -19,23 +17,25 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '7' docker_image: -- quay.io/condaforge/linux-anvil-cuda:10.2 +- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 gflags: - '2.2' glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 numpy: - '1.19' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -49,17 +49,17 @@ pin_run_as_build: python: - 3.9.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - linux-64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version -- - cuda_compiler_version + - cuda_compiler_version - cdt_name - docker_image - - python diff --git a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpython.yaml similarity index 76% rename from dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpython.yaml index dfc87c80b31..ba03ed2bb66 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpython.yaml @@ -1,15 +1,13 @@ -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '9' +- '7' cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -19,23 +17,25 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '7' docker_image: -- quay.io/condaforge/linux-anvil-cuda:10.2 +- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 gflags: - '2.2' glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 numpy: -- '1.17' +- '1.21' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -47,19 +47,19 @@ pin_run_as_build: zlib: max_pin: x.x python: -- 3.6.* *_cpython +- 3.10.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - linux-64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version -- - cuda_compiler_version + - cuda_compiler_version - cdt_name - docker_image - - python diff --git a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.7.____cpython.yaml similarity index 80% rename from dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.7.____cpython.yaml index ff26bc5215e..1f10c7e49e5 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.7.____cpython.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -9,7 +7,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,21 +19,23 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 gflags: - '2.2' glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 numpy: -- '1.17' +- '1.18' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -49,17 +49,17 @@ pin_run_as_build: python: - 3.7.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - linux-64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version -- - cuda_compiler_version + - cuda_compiler_version - cdt_name - docker_image - - python diff --git a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.8.____cpython.yaml similarity index 80% rename from dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.8.____cpython.yaml index 5703aba68ec..0785b1416e5 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.8.____cpython.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -9,7 +7,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,21 +19,23 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 gflags: - '2.2' glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 numpy: -- '1.17' +- '1.18' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -49,17 +49,17 @@ pin_run_as_build: python: - 3.8.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - linux-64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version -- - cuda_compiler_version + - cuda_compiler_version - cdt_name - docker_image - - python diff --git a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.19python3.9.____cpython.yaml similarity index 81% rename from dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.19python3.9.____cpython.yaml index 8ff58d717e8..8d0459dc131 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.19python3.9.____cpython.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -9,7 +7,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,21 +19,23 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 gflags: - '2.2' glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 numpy: - '1.19' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -49,17 +49,17 @@ pin_run_as_build: python: - 3.9.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - linux-64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version -- - cuda_compiler_version + - cuda_compiler_version - cdt_name - docker_image - - python diff --git a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.21python3.10.____cpython.yaml similarity index 78% rename from dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.21python3.10.____cpython.yaml index 3aba0f1294c..8430814c6cc 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.21python3.10.____cpython.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -9,7 +7,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,21 +19,23 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 gflags: - '2.2' glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 numpy: -- '1.17' +- '1.21' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -47,19 +47,19 @@ pin_run_as_build: zlib: max_pin: x.x python: -- 3.6.* *_cpython +- 3.10.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - linux-64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version -- - cuda_compiler_version + - cuda_compiler_version - cdt_name - docker_image - - python diff --git a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml similarity index 80% rename from dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.7.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml index 2b1715d585b..62676cf0d74 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.7.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -23,21 +21,23 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 gflags: - '2.2' glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 numpy: -- '1.17' +- '1.18' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -51,16 +51,19 @@ pin_run_as_build: python: - 3.7.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - linux-aarch64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image - - python - numpy zlib: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml similarity index 80% rename from dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.8.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml index 5a0e7313e9d..fbb0d169667 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.8.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -23,21 +21,23 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 gflags: - '2.2' glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 numpy: -- '1.17' +- '1.18' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -51,16 +51,19 @@ pin_run_as_build: python: - 3.8.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - linux-aarch64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image - - python - numpy zlib: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml index 16ace00bdae..1620fa4be5d 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -23,21 +21,23 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 gflags: - '2.2' glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 numpy: - '1.19' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -51,16 +51,19 @@ pin_run_as_build: python: - 3.9.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - linux-aarch64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image - - python - numpy zlib: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml similarity index 78% rename from dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.6.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml index 5bb4381febf..feec3fb52d9 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.6.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -23,21 +21,23 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 gflags: - '2.2' glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 numpy: -- '1.17' +- '1.21' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -49,18 +49,21 @@ pin_run_as_build: zlib: max_pin: x.x python: -- 3.6.* *_cpython +- 3.10.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - linux-aarch64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image - - python - numpy zlib: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml new file mode 100644 index 00000000000..6c1c2c23d5b --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml @@ -0,0 +1,68 @@ +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '7' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- gxx +cxx_compiler_version: +- '7' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +gflags: +- '2.2' +glog: +- '0.5' +grpc_cpp: +- '1.42' +libprotobuf: +- '3.19' +lz4_c: +- 1.9.3 +numpy: +- '1.18' +openssl: +- 1.1.1 +orc: +- 1.7.2 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.7.* *_cpython +re2: +- 2021.11.01 +snappy: +- '1' +target_platform: +- linux-ppc64le +thrift_cpp: +- 0.15.0 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml new file mode 100644 index 00000000000..3af41aafb87 --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml @@ -0,0 +1,68 @@ +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '7' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- gxx +cxx_compiler_version: +- '7' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +gflags: +- '2.2' +glog: +- '0.5' +grpc_cpp: +- '1.42' +libprotobuf: +- '3.19' +lz4_c: +- 1.9.3 +numpy: +- '1.18' +openssl: +- 1.1.1 +orc: +- 1.7.2 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.8.* *_cpython +re2: +- 2021.11.01 +snappy: +- '1' +target_platform: +- linux-ppc64le +thrift_cpp: +- 0.15.0 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml new file mode 100644 index 00000000000..a67a9714e87 --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml @@ -0,0 +1,68 @@ +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '7' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- gxx +cxx_compiler_version: +- '7' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +gflags: +- '2.2' +glog: +- '0.5' +grpc_cpp: +- '1.42' +libprotobuf: +- '3.19' +lz4_c: +- 1.9.3 +numpy: +- '1.19' +openssl: +- 1.1.1 +orc: +- 1.7.2 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.9.* *_cpython +re2: +- 2021.11.01 +snappy: +- '1' +target_platform: +- linux-ppc64le +thrift_cpp: +- 0.15.0 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml new file mode 100644 index 00000000000..e79c5d25ac7 --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,68 @@ +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '7' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- gxx +cxx_compiler_version: +- '7' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +gflags: +- '2.2' +glog: +- '0.5' +grpc_cpp: +- '1.42' +libprotobuf: +- '3.19' +lz4_c: +- 1.9.3 +numpy: +- '1.21' +openssl: +- 1.1.1 +orc: +- 1.7.2 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +re2: +- 2021.11.01 +snappy: +- '1' +target_platform: +- linux-ppc64le +thrift_cpp: +- 0.15.0 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml similarity index 86% rename from dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml index d2c046ab2ea..d0629600bba 100644 --- a/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -9,7 +7,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler_version: @@ -23,17 +21,19 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.17' +- '1.18' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -47,13 +47,13 @@ pin_run_as_build: python: - 3.7.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - osx-64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml similarity index 86% rename from dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml index 43f63445469..cfd3391109b 100644 --- a/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -9,7 +7,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler_version: @@ -23,17 +21,19 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.17' +- '1.18' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -47,13 +47,13 @@ pin_run_as_build: python: - 3.8.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - osx-64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml index 7cc730f9bb0..d12db70999c 100644 --- a/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -9,7 +7,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler_version: @@ -23,17 +21,19 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: - '1.19' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -47,13 +47,13 @@ pin_run_as_build: python: - 3.9.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - osx-64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml similarity index 84% rename from dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml index 0be59fe1a38..70c8c76b570 100644 --- a/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -9,7 +7,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler_version: @@ -23,17 +21,19 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.17' +- '1.21' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -45,15 +45,15 @@ pin_run_as_build: zlib: max_pin: x.x python: -- 3.6.* *_cpython +- 3.10.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - osx-64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml similarity index 86% rename from dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.8.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml index e5f8e2ba2a8..faafdda524d 100644 --- a/dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -9,7 +7,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge/label/rust_dev,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler_version: @@ -23,17 +21,19 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 macos_machine: - arm64-apple-darwin20.0.0 numpy: - '1.19' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -47,13 +47,13 @@ pin_run_as_build: python: - 3.8.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - osx-arm64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml similarity index 86% rename from dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.9.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml index cd3eca6d23d..e71619953b1 100644 --- a/dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -aws_sdk_cpp: -- 1.8.186 bzip2: - '1' c_compiler: @@ -9,7 +7,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge/label/rust_dev,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler_version: @@ -23,17 +21,19 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.38' +- '1.42' libprotobuf: -- '3.16' +- '3.19' lz4_c: - 1.9.3 macos_machine: - arm64-apple-darwin20.0.0 numpy: - '1.19' +openssl: +- 1.1.1 orc: -- 1.6.8 +- 1.7.2 pin_run_as_build: bzip2: max_pin: x @@ -47,13 +47,13 @@ pin_run_as_build: python: - 3.9.* *_cpython re2: -- 2021.06.01 +- 2021.11.01 snappy: - '1' target_platform: - osx-arm64 thrift_cpp: -- 0.14.2 +- 0.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/dev/tasks/conda-recipes/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml new file mode 100644 index 00000000000..dacd3030053 --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,65 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +gflags: +- '2.2' +glog: +- '0.5' +grpc_cpp: +- '1.42' +libprotobuf: +- '3.19' +lz4_c: +- 1.9.3 +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.21' +openssl: +- 1.1.1 +orc: +- 1.7.2 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +re2: +- 2021.11.01 +snappy: +- '1' +target_platform: +- osx-arm64 +thrift_cpp: +- 0.15.0 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml deleted file mode 100644 index 49638f362f7..00000000000 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml +++ /dev/null @@ -1,55 +0,0 @@ -aws_sdk_cpp: -- 1.8.186 -bzip2: -- '1' -c_compiler: -- vs2017 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '10.2' -cxx_compiler: -- vs2017 -gflags: -- '2.2' -glog: -- '0.5' -grpc_cpp: -- '1.38' -libprotobuf: -- '3.16' -lz4_c: -- 1.9.3 -numpy: -- '1.17' -pin_run_as_build: - bzip2: - max_pin: x - lz4-c: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x - zlib: - max_pin: x.x -python: -- 3.6.* *_cpython -re2: -- 2021.06.01 -snappy: -- '1' -target_platform: -- win-64 -thrift_cpp: -- 0.14.2 -zip_keys: -- - numpy - - python -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml deleted file mode 100644 index bb70b36bebd..00000000000 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml +++ /dev/null @@ -1,55 +0,0 @@ -aws_sdk_cpp: -- 1.8.186 -bzip2: -- '1' -c_compiler: -- vs2017 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '10.2' -cxx_compiler: -- vs2017 -gflags: -- '2.2' -glog: -- '0.5' -grpc_cpp: -- '1.38' -libprotobuf: -- '3.16' -lz4_c: -- 1.9.3 -numpy: -- '1.17' -pin_run_as_build: - bzip2: - max_pin: x - lz4-c: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x - zlib: - max_pin: x.x -python: -- 3.7.* *_cpython -re2: -- 2021.06.01 -snappy: -- '1' -target_platform: -- win-64 -thrift_cpp: -- 0.14.2 -zip_keys: -- - numpy - - python -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml deleted file mode 100644 index a631dd8c39c..00000000000 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml +++ /dev/null @@ -1,55 +0,0 @@ -aws_sdk_cpp: -- 1.8.186 -bzip2: -- '1' -c_compiler: -- vs2017 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '10.2' -cxx_compiler: -- vs2017 -gflags: -- '2.2' -glog: -- '0.5' -grpc_cpp: -- '1.38' -libprotobuf: -- '3.16' -lz4_c: -- 1.9.3 -numpy: -- '1.17' -pin_run_as_build: - bzip2: - max_pin: x - lz4-c: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x - zlib: - max_pin: x.x -python: -- 3.8.* *_cpython -re2: -- 2021.06.01 -snappy: -- '1' -target_platform: -- win-64 -thrift_cpp: -- 0.14.2 -zip_keys: -- - numpy - - python -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.7.____cpython.yaml index 6a740535900..6944dade897 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.7.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.7.____cpython.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.9.120 bzip2: - '1' c_compiler: @@ -19,9 +17,9 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.40' +- '1.42' libprotobuf: -- '3.18' +- '3.19' lz4_c: - 1.9.3 numpy: @@ -41,7 +39,7 @@ pin_run_as_build: python: - 3.7.* *_cpython re2: -- 2021.09.01 +- 2021.11.01 snappy: - '1' target_platform: @@ -49,8 +47,8 @@ target_platform: thrift_cpp: - 0.15.0 zip_keys: -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.8.____cpython.yaml index 3e86c49a9ba..7c92cdfcb8f 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.8.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.8.____cpython.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.9.120 bzip2: - '1' c_compiler: @@ -19,9 +17,9 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.40' +- '1.42' libprotobuf: -- '3.18' +- '3.19' lz4_c: - 1.9.3 numpy: @@ -41,7 +39,7 @@ pin_run_as_build: python: - 3.8.* *_cpython re2: -- 2021.09.01 +- 2021.11.01 snappy: - '1' target_platform: @@ -49,8 +47,8 @@ target_platform: thrift_cpp: - 0.15.0 zip_keys: -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml index da5cc7239b1..f263284eee0 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.9.120 bzip2: - '1' c_compiler: @@ -19,9 +17,9 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.40' +- '1.42' libprotobuf: -- '3.18' +- '3.19' lz4_c: - 1.9.3 numpy: @@ -41,7 +39,7 @@ pin_run_as_build: python: - 3.9.* *_cpython re2: -- 2021.09.01 +- 2021.11.01 snappy: - '1' target_platform: @@ -49,8 +47,8 @@ target_platform: thrift_cpp: - 0.15.0 zip_keys: -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml index f16a14b8d5b..4d3980a1764 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.9.120 bzip2: - '1' c_compiler: @@ -19,9 +17,9 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.40' +- '1.42' libprotobuf: -- '3.18' +- '3.19' lz4_c: - 1.9.3 numpy: @@ -41,7 +39,7 @@ pin_run_as_build: python: - 3.10.* *_cpython re2: -- 2021.09.01 +- 2021.11.01 snappy: - '1' target_platform: @@ -49,8 +47,8 @@ target_platform: thrift_cpp: - 0.15.0 zip_keys: -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython.yaml index a8bea46e6d1..53cfc86dc8c 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.9.120 bzip2: - '1' c_compiler: @@ -19,9 +17,9 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.40' +- '1.42' libprotobuf: -- '3.18' +- '3.19' lz4_c: - 1.9.3 numpy: @@ -41,7 +39,7 @@ pin_run_as_build: python: - 3.7.* *_cpython re2: -- 2021.09.01 +- 2021.11.01 snappy: - '1' target_platform: @@ -49,8 +47,8 @@ target_platform: thrift_cpp: - 0.15.0 zip_keys: -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.8.____cpython.yaml index 093f5b4310e..e1c54b4b6ce 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.8.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.8.____cpython.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.9.120 bzip2: - '1' c_compiler: @@ -19,9 +17,9 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.40' +- '1.42' libprotobuf: -- '3.18' +- '3.19' lz4_c: - 1.9.3 numpy: @@ -41,7 +39,7 @@ pin_run_as_build: python: - 3.8.* *_cpython re2: -- 2021.09.01 +- 2021.11.01 snappy: - '1' target_platform: @@ -49,8 +47,8 @@ target_platform: thrift_cpp: - 0.15.0 zip_keys: -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml index 34016eaba72..4140f54515d 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.9.120 bzip2: - '1' c_compiler: @@ -19,9 +17,9 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.40' +- '1.42' libprotobuf: -- '3.18' +- '3.19' lz4_c: - 1.9.3 numpy: @@ -41,7 +39,7 @@ pin_run_as_build: python: - 3.9.* *_cpython re2: -- 2021.09.01 +- 2021.11.01 snappy: - '1' target_platform: @@ -49,8 +47,8 @@ target_platform: thrift_cpp: - 0.15.0 zip_keys: -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml index b42cc3efb4c..e90f5cdefce 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.9.120 bzip2: - '1' c_compiler: @@ -19,9 +17,9 @@ gflags: glog: - '0.5' grpc_cpp: -- '1.40' +- '1.42' libprotobuf: -- '3.18' +- '3.19' lz4_c: - 1.9.3 numpy: @@ -41,7 +39,7 @@ pin_run_as_build: python: - 3.10.* *_cpython re2: -- 2021.09.01 +- 2021.11.01 snappy: - '1' target_platform: @@ -49,8 +47,8 @@ target_platform: thrift_cpp: - 0.15.0 zip_keys: -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index e91bc16f58d..899e92aa219 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -194,7 +194,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython + config: linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.7.____cpython r_config: linux_64_r_base4.0 artifacts: - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -204,7 +204,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython + config: linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.7.____cpython r_config: linux_64_r_base4.1 artifacts: - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -214,7 +214,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython + config: linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.18python3.8.____cpython artifacts: - arrow-cpp-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -223,13 +223,22 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython + config: linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.19python3.9.____cpython.yaml artifacts: - arrow-cpp-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 -{% for python_version, numpy_version in [("3.7", "1.17"), - ("3.8", "1.17"), + conda-linux-gcc-py310-cpu: + ci: azure + template: conda-recipes/azure.linux.yml + params: + config: linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.21python3.10.____cpython.yaml + artifacts: + - arrow-cpp-{no_rc_version}-py310(h[a-z0-9]+)_0_cpu.tar.bz2 + - pyarrow-{no_rc_version}-py310(h[a-z0-9]+)_0_cpu.tar.bz2 + +{% for python_version, numpy_version in [("3.7", "1.18"), + ("3.8", "1.18"), ("3.9", "1.19"), ("3.10", "1.21")] %} {% set pyver = python_version | replace(".", "") %} @@ -238,7 +247,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_64_cuda_compiler_version10.2numpy{{ numpy_version }}python{{ python_version }}.____cpython + config: linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy{{ numpy_version }}python{{ python_version }}.____cpython artifacts: - arrow-cpp-{no_rc_version}-py{{ pyver }}(h[a-z0-9]+)_0_cuda.tar.bz2 - pyarrow-{no_rc_version}-py{{ pyver }}(h[a-z0-9]+)_0_cuda.tar.bz2 @@ -252,6 +261,15 @@ tasks: - arrow-cpp-{no_rc_version}-py{{ pyver }}(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py{{ pyver }}(h[a-z0-9]+)_0_cpu.tar.bz2 + conda-linux-gcc-py{{ pyver }}-ppc64le: + ci: azure + template: conda-recipes/azure.linux.yml + params: + config: linux_ppc64le_numpy{{ numpy_version }}python{{ python_version }}.____cpython + artifacts: + - arrow-cpp-{no_rc_version}-py{{ pyver }}(h[a-z0-9]+)_0_cpu.tar.bz2 + - pyarrow-{no_rc_version}-py{{ pyver }}(h[a-z0-9]+)_0_cpu.tar.bz2 + {% endfor %} ############################## Conda OSX #################################### @@ -260,7 +278,7 @@ tasks: ci: azure template: conda-recipes/azure.osx.yml params: - config: osx_64_numpy1.17python3.7.____cpython + config: osx_64_numpy1.18python3.7.____cpython r_config: osx_64_r_base4.0 artifacts: - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -270,7 +288,7 @@ tasks: ci: azure template: conda-recipes/azure.osx.yml params: - config: osx_64_numpy1.17python3.7.____cpython + config: osx_64_numpy1.18python3.7.____cpython r_config: osx_64_r_base4.1 artifacts: - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -280,7 +298,7 @@ tasks: ci: azure template: conda-recipes/azure.osx.yml params: - config: osx_64_numpy1.17python3.8.____cpython + config: osx_64_numpy1.18python3.8.____cpython artifacts: - arrow-cpp-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -294,11 +312,20 @@ tasks: - arrow-cpp-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 + conda-osx-clang-py310: + ci: azure + template: conda-recipes/azure.osx.yml + params: + config: osx_64_numpy1.21python3.10.____cpython + artifacts: + - arrow-cpp-{no_rc_version}-py310(h[a-z0-9]+)_0_cpu.tar.bz2 + - pyarrow-{no_rc_version}-py310(h[a-z0-9]+)_0_cpu.tar.bz2 + conda-osx-arm64-clang-py38: ci: azure template: conda-recipes/azure.osx.yml params: - config: osx_arm64_python3.8.____cpython + config: osx_arm64_numpy1.19python3.8.____cpython artifacts: - arrow-cpp-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -307,18 +334,27 @@ tasks: ci: azure template: conda-recipes/azure.osx.yml params: - config: osx_arm64_python3.9.____cpython + config: osx_arm64_numpy1.19python3.9.____cpython artifacts: - arrow-cpp-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 + conda-osx-arm64-clang-py310: + ci: azure + template: conda-recipes/azure.osx.yml + params: + config: osx_arm64_numpy1.21python3.10.____cpython + artifacts: + - arrow-cpp-{no_rc_version}-py310(h[a-z0-9]+)_0_cpu.tar.bz2 + - pyarrow-{no_rc_version}-py310(h[a-z0-9]+)_0_cpu.tar.bz2 + ############################## Conda Windows ################################ conda-win-vs2017-py37-r40: ci: azure template: conda-recipes/azure.win.yml params: - config: win_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython + config: win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython r_config: win_64_r_base4.0 artifacts: - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -328,7 +364,7 @@ tasks: ci: azure template: conda-recipes/azure.win.yml params: - config: win_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython + config: win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython r_config: win_64_r_base4.1 artifacts: - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -338,7 +374,7 @@ tasks: ci: azure template: conda-recipes/azure.win.yml params: - config: win_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython + config: win_64_cuda_compiler_versionNonenumpy1.18python3.8.____cpython artifacts: - arrow-cpp-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -349,9 +385,19 @@ tasks: params: config: win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython artifacts: - - arrow-cpp-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 - - pyarrow-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 + - arrow-cpp-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 + - pyarrow-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 + + conda-win-vs2017-py310: + ci: azure + template: conda-recipes/azure.win.yml + params: + config: win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython + artifacts: + - arrow-cpp-{no_rc_version}-py310(h[a-z0-9]+)_0_cpu.tar.bz2 + - pyarrow-{no_rc_version}-py310(h[a-z0-9]+)_0_cpu.tar.bz2 +# TODO: Windows CUDA {% for python_version, python_tag, abi_tag in [("3.7", "cp37", "cp37m"), ("3.8", "cp38", "cp38"), From 44d84f5ed92f91278b18351d26092503fdf16e03 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 23 Jan 2022 17:54:02 +0100 Subject: [PATCH 04/18] Add openssl to conda recipe --- dev/tasks/conda-recipes/arrow-cpp/meta.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml index 44913c44543..a77d7170137 100644 --- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml +++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml @@ -82,6 +82,7 @@ outputs: - lz4-c - numpy - orc # [unix] + - openssl - python - rapidjson - re2 @@ -163,6 +164,8 @@ outputs: string: py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} ignore_run_exports: - cudatoolkit + ignore_run_exports_from: + - openssl track_features: {{ "- arrow-cuda" if cuda_enabled else "" }} requirements: @@ -183,6 +186,7 @@ outputs: - cython - numpy - python + - openssl - setuptools - setuptools_scm - six @@ -235,6 +239,8 @@ outputs: string: py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} ignore_run_exports: - cudatoolkit + ignore_run_exports_from: + - openssl track_features: {{ "- arrow-cuda" if cuda_enabled else "" }} requirements: @@ -256,6 +262,7 @@ outputs: - cython - numpy - python + - openssl - setuptools - setuptools_scm - six From 9310edb529dd9280d5b3962c4174519c83d5e6c8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 23 Jan 2022 19:28:47 +0100 Subject: [PATCH 05/18] Set CMAKE_CXX_STANDARD in conda recipe --- dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh b/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh index 814c8d72c1b..37cdd929b29 100644 --- a/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh +++ b/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh @@ -47,6 +47,12 @@ else EXTRA_CMAKE_ARGS=" ${EXTRA_CMAKE_ARGS} -DARROW_GANDIVA=ON" fi +if [[ "${target_platform}" == osx-* ]]; then + EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=14" +else + EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=17" +fi + cmake \ -DARROW_BOOST_USE_SHARED=ON \ -DARROW_BUILD_BENCHMARKS=OFF \ From e00c14da01eda63c18e06e4ff3b74d8ae149f7f0 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 23 Jan 2022 21:48:10 +0100 Subject: [PATCH 06/18] Update macOS Azure image --- dev/tasks/conda-recipes/azure.osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/conda-recipes/azure.osx.yml b/dev/tasks/conda-recipes/azure.osx.yml index 99bb76ba520..420b52c088f 100755 --- a/dev/tasks/conda-recipes/azure.osx.yml +++ b/dev/tasks/conda-recipes/azure.osx.yml @@ -3,7 +3,7 @@ jobs: - job: osx pool: - vmImage: macOS-10.14 + vmImage: macOS-10.15 timeoutInMinutes: 360 variables: CONFIG: {{ config }} From 76ea85aefb9c8dca7b86b96fda11bb36e2a9b510 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 23 Jan 2022 21:48:22 +0100 Subject: [PATCH 07/18] Remove .yaml from configs --- dev/tasks/tasks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 899e92aa219..c0fd32a22fe 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -223,7 +223,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.19python3.9.____cpython.yaml + config: linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.19python3.9.____cpython artifacts: - arrow-cpp-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -232,7 +232,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.21python3.10.____cpython.yaml + config: linux_64_c_compiler_version9cuda_compiler_versionNonecxx_compiler_version9numpy1.21python3.10.____cpython artifacts: - arrow-cpp-{no_rc_version}-py310(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py310(h[a-z0-9]+)_0_cpu.tar.bz2 From 7938e2e9d7caa4adba8c924e1bb34f13d7fab5cc Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 23 Jan 2022 21:50:10 +0100 Subject: [PATCH 08/18] Use mambabuild on Windows --- dev/tasks/conda-recipes/azure.win.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/tasks/conda-recipes/azure.win.yml b/dev/tasks/conda-recipes/azure.win.yml index a1340a0b651..f7a4e531546 100755 --- a/dev/tasks/conda-recipes/azure.win.yml +++ b/dev/tasks/conda-recipes/azure.win.yml @@ -37,7 +37,7 @@ jobs: - task: CondaEnvironment@1 inputs: - packageSpecs: 'python=3.9 conda-build conda conda-forge::conda-forge-ci-setup=3 pip' # Optional + packageSpecs: 'python=3.9 conda-build boa conda conda-forge::conda-forge-ci-setup=3 pip' # Optional installOptions: "-c conda-forge" updateConda: true displayName: Install conda-build and activate environment @@ -58,7 +58,7 @@ jobs: workingDirectory: arrow\dev\tasks\conda-recipes - script: | - conda.exe build arrow-cpp parquet-cpp -m .ci_support\%CONFIG%.yaml + conda.exe mambabuild arrow-cpp parquet-cpp -m .ci_support\%CONFIG%.yaml displayName: Build recipe workingDirectory: arrow\dev\tasks\conda-recipes env: @@ -66,7 +66,7 @@ jobs: condition: not(contains(variables['CONFIG'], 'vs2008')) - script: | - conda.exe build r-arrow -m .ci_support\r\%R_CONFIG%.yaml + conda.exe mambabuild r-arrow -m .ci_support\r\%R_CONFIG%.yaml displayName: Build recipe workingDirectory: arrow\dev\tasks\conda-recipes env: From 11a14d9bf657f11d243968174cd9c19ac9fdd707 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 24 Jan 2022 08:17:28 +0100 Subject: [PATCH 09/18] Update azure-win --- dev/tasks/conda-recipes/azure.win.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dev/tasks/conda-recipes/azure.win.yml b/dev/tasks/conda-recipes/azure.win.yml index f7a4e531546..b36614a3997 100755 --- a/dev/tasks/conda-recipes/azure.win.yml +++ b/dev/tasks/conda-recipes/azure.win.yml @@ -37,16 +37,20 @@ jobs: - task: CondaEnvironment@1 inputs: - packageSpecs: 'python=3.9 conda-build boa conda conda-forge::conda-forge-ci-setup=3 pip' # Optional + packageSpecs: 'python=3.9 conda-build conda "conda-forge-ci-setup=3" pip boa' # Optional installOptions: "-c conda-forge" updateConda: true displayName: Install conda-build and activate environment + - script: set PYTHONUNBUFFERED=1 + displayName: Set PYTHONUNBUFFERED {{ macros.azure_checkout_arrow()|indent(2) }} # Configure the VM - - script: setup_conda_rc .\ .\ .\.ci_support\%CONFIG%.yaml + - script: | + call activate base + setup_conda_rc .\ .\ .\.ci_support\%CONFIG%.yaml workingDirectory: arrow\dev\tasks\conda-recipes # Configure the VM. From ad78f044b28c0269faf63fec57f772af49cdfdf4 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 24 Jan 2022 08:36:28 +0100 Subject: [PATCH 10/18] More activation on windows --- dev/tasks/conda-recipes/azure.win.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/tasks/conda-recipes/azure.win.yml b/dev/tasks/conda-recipes/azure.win.yml index b36614a3997..814f78abec9 100755 --- a/dev/tasks/conda-recipes/azure.win.yml +++ b/dev/tasks/conda-recipes/azure.win.yml @@ -62,6 +62,7 @@ jobs: workingDirectory: arrow\dev\tasks\conda-recipes - script: | + call activate base conda.exe mambabuild arrow-cpp parquet-cpp -m .ci_support\%CONFIG%.yaml displayName: Build recipe workingDirectory: arrow\dev\tasks\conda-recipes @@ -70,6 +71,7 @@ jobs: condition: not(contains(variables['CONFIG'], 'vs2008')) - script: | + call activate base conda.exe mambabuild r-arrow -m .ci_support\r\%R_CONFIG%.yaml displayName: Build recipe workingDirectory: arrow\dev\tasks\conda-recipes From d766bf7a69021081bc483921959816d7f9f09590 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 24 Jan 2022 09:03:22 +0100 Subject: [PATCH 11/18] Update build script for pyarrow --- dev/tasks/conda-recipes/arrow-cpp/build-pyarrow.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/tasks/conda-recipes/arrow-cpp/build-pyarrow.sh b/dev/tasks/conda-recipes/arrow-cpp/build-pyarrow.sh index f0cf9ceb472..7c73d364a95 100644 --- a/dev/tasks/conda-recipes/arrow-cpp/build-pyarrow.sh +++ b/dev/tasks/conda-recipes/arrow-cpp/build-pyarrow.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/bin/sh set -e set -x @@ -23,6 +23,7 @@ export PYARROW_WITH_PARQUET=1 export PYARROW_WITH_PLASMA=1 export PYARROW_WITH_S3=1 export PYARROW_CMAKE_GENERATOR=Ninja +export PYARROW_CMAKE_OPTIONS="-DARROW_SIMD_LEVEL=NONE" BUILD_EXT_FLAGS="" # Enable CUDA support @@ -34,7 +35,7 @@ fi # Resolve: Make Error at cmake_modules/SetupCxxFlags.cmake:338 (message): Unsupported arch flag: -march=. if [[ "${target_platform}" == "linux-aarch64" ]]; then - export PYARROW_CMAKE_OPTIONS="-DARROW_ARMV8_ARCH=armv8-a" + export PYARROW_CMAKE_OPTIONS="-DARROW_ARMV8_ARCH=armv8-a ${PYARROW_CMAKE_OPTIONS}" fi cd python From 54d106284a7659a06205c92454bfcf8f187050e6 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 24 Jan 2022 13:50:44 +0100 Subject: [PATCH 12/18] Update r variant files --- .../conda-recipes/.ci_support/r/linux_64_r_base4.0.yaml | 6 ++---- .../conda-recipes/.ci_support/r/linux_64_r_base4.1.yaml | 6 ++---- dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.0.yaml | 2 +- dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.1.yaml | 2 +- dev/tasks/conda-recipes/.ci_support/r/win_64_r_base4.0.yaml | 2 +- dev/tasks/conda-recipes/.ci_support/r/win_64_r_base4.1.yaml | 2 +- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dev/tasks/conda-recipes/.ci_support/r/linux_64_r_base4.0.yaml b/dev/tasks/conda-recipes/.ci_support/r/linux_64_r_base4.0.yaml index dfdfae9665a..bb4dbcbbe63 100644 --- a/dev/tasks/conda-recipes/.ci_support/r/linux_64_r_base4.0.yaml +++ b/dev/tasks/conda-recipes/.ci_support/r/linux_64_r_base4.0.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 pin_run_as_build: r-base: min_pin: x.x @@ -25,5 +25,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - cdt_name - - docker_image diff --git a/dev/tasks/conda-recipes/.ci_support/r/linux_64_r_base4.1.yaml b/dev/tasks/conda-recipes/.ci_support/r/linux_64_r_base4.1.yaml index c5f455c1917..00d944cb861 100644 --- a/dev/tasks/conda-recipes/.ci_support/r/linux_64_r_base4.1.yaml +++ b/dev/tasks/conda-recipes/.ci_support/r/linux_64_r_base4.1.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 pin_run_as_build: r-base: min_pin: x.x @@ -25,5 +25,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - cdt_name - - docker_image diff --git a/dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.0.yaml b/dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.0.yaml index 08bb81d0808..20f3879b30a 100644 --- a/dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.0.yaml +++ b/dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.0.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.1.yaml b/dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.1.yaml index 9974c663853..8926fd82b2d 100644 --- a/dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.1.yaml +++ b/dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.1.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/dev/tasks/conda-recipes/.ci_support/r/win_64_r_base4.0.yaml b/dev/tasks/conda-recipes/.ci_support/r/win_64_r_base4.0.yaml index 02c2a70756d..bb8f9721636 100644 --- a/dev/tasks/conda-recipes/.ci_support/r/win_64_r_base4.0.yaml +++ b/dev/tasks/conda-recipes/.ci_support/r/win_64_r_base4.0.yaml @@ -1,5 +1,5 @@ channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main pin_run_as_build: diff --git a/dev/tasks/conda-recipes/.ci_support/r/win_64_r_base4.1.yaml b/dev/tasks/conda-recipes/.ci_support/r/win_64_r_base4.1.yaml index 2fe9ad314dc..72a5bf336c1 100644 --- a/dev/tasks/conda-recipes/.ci_support/r/win_64_r_base4.1.yaml +++ b/dev/tasks/conda-recipes/.ci_support/r/win_64_r_base4.1.yaml @@ -1,5 +1,5 @@ channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main pin_run_as_build: From a34c8934c5313135a5f689125584b414ec1b4582 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 24 Jan 2022 13:51:12 +0100 Subject: [PATCH 13/18] Update r-arrow recipe --- dev/tasks/conda-recipes/r-arrow/meta.yaml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dev/tasks/conda-recipes/r-arrow/meta.yaml b/dev/tasks/conda-recipes/r-arrow/meta.yaml index 5f0643bef37..0f743fcdbc5 100644 --- a/dev/tasks/conda-recipes/r-arrow/meta.yaml +++ b/dev/tasks/conda-recipes/r-arrow/meta.yaml @@ -7,21 +7,30 @@ package: version: {{ version|replace("-", "_") }} source: - path: ../../../../ + url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz + sha256: 3786b3d2df954d078b3e68f98d2e5aecbaa3fa2accf075d7a3a13c187b9c5294 build: merge_build_host: true # [win] - number: 0 + number: 1 rpaths: - lib/R/lib/ - lib/ requirements: build: + - cross-r-base {{ r_base }} # [build_platform != target_platform] + - r-r6 # [build_platform != target_platform] + - r-assertthat # [build_platform != target_platform] + - r-bit64 # [build_platform != target_platform] + - r-purrr # [build_platform != target_platform] + - r-rlang # [build_platform != target_platform] + - r-tidyselect # [build_platform != target_platform] + - python 3.9 # [build_platform != target_platform] - {{ compiler('c') }} # [not win] - {{ compiler('cxx') }} # [not win] - {{ compiler('r_clang') }} # [win] - - pkg-config # [not win] + - pkg-config - {{ posix }}make - {{ posix }}sed # [win] - {{ posix }}coreutils # [win] @@ -32,8 +41,8 @@ requirements: - pkg-config # [win] - r-base - arrow-cpp {{ version }} - - r-cpp11 - r-r6 + - r-cpp11 - r-assertthat - r-bit64 - r-purrr From d87af2a16c80067ab8ccd59a08e757b6c9a6b775 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 24 Jan 2022 16:50:39 +0100 Subject: [PATCH 14/18] Fix path to R sources --- dev/tasks/conda-recipes/r-arrow/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev/tasks/conda-recipes/r-arrow/meta.yaml b/dev/tasks/conda-recipes/r-arrow/meta.yaml index 0f743fcdbc5..1a906f34628 100644 --- a/dev/tasks/conda-recipes/r-arrow/meta.yaml +++ b/dev/tasks/conda-recipes/r-arrow/meta.yaml @@ -7,8 +7,7 @@ package: version: {{ version|replace("-", "_") }} source: - url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz - sha256: 3786b3d2df954d078b3e68f98d2e5aecbaa3fa2accf075d7a3a13c187b9c5294 + path: ../../../../ build: merge_build_host: true # [win] From cd7999285a9376e47b358507e87dc4f0c3d8d057 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 6 Feb 2022 09:34:31 +0100 Subject: [PATCH 15/18] Pin aws-sdk-cpp --- dev/tasks/conda-recipes/arrow-cpp/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml index a77d7170137..d87c63a714f 100644 --- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml +++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml @@ -66,7 +66,8 @@ outputs: - {{ compiler('cxx') }} - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] host: - - aws-sdk-cpp + # https://issues.apache.org/jira/browse/ARROW-15141 + - aws-sdk-cpp 1.8.186 - boost-cpp >=1.70 - brotli - bzip2 From 8c4f77a9f35eb97a47a09a9555c27c9ca350bd5e Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Sun, 6 Feb 2022 13:34:45 +0000 Subject: [PATCH 16/18] Add explicit conversion Explicitly convert from `std::unique_ptr` to a `std::shared_ptr` on the way to convert to `Result>`. I am not sure why it only failed with one compiler. --- cpp/src/arrow/filesystem/gcsfs.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/src/arrow/filesystem/gcsfs.cc b/cpp/src/arrow/filesystem/gcsfs.cc index a61fef2246e..1f719c3ffeb 100644 --- a/cpp/src/arrow/filesystem/gcsfs.cc +++ b/cpp/src/arrow/filesystem/gcsfs.cc @@ -138,7 +138,7 @@ class GcsInputStream : public arrow::io::InputStream { stream_.read(reinterpret_cast(buffer->mutable_data()), nbytes); ARROW_GCS_RETURN_NOT_OK(stream_.status()); RETURN_NOT_OK(buffer->Resize(stream_.gcount(), true)); - return buffer; + return std::shared_ptr(std::move(buffer)); } //@} From 366b494f8229971614f2935cac546c089ac84a11 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 6 Feb 2022 15:56:32 +0100 Subject: [PATCH 17/18] Use mamba to install and update boa --- dev/tasks/conda-recipes/build_steps.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/tasks/conda-recipes/build_steps.sh b/dev/tasks/conda-recipes/build_steps.sh index b561ecfdc86..dfc468c0e44 100755 --- a/dev/tasks/conda-recipes/build_steps.sh +++ b/dev/tasks/conda-recipes/build_steps.sh @@ -25,7 +25,8 @@ conda-build: CONDARC -conda install --yes --quiet conda-forge-ci-setup=3 conda-build boa pip -c conda-forge +mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge +mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${FEEDSTOCK_ROOT}" "${CONFIG_FILE}" From 057860de5821e2f1a7b61ff838638ca3dde7a8cd Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 6 Feb 2022 21:43:52 +0100 Subject: [PATCH 18/18] Pin to stable aws-sdk-cpp --- ci/conda_env_cpp.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/conda_env_cpp.txt b/ci/conda_env_cpp.txt index 435e08d7166..fb533144dfb 100644 --- a/ci/conda_env_cpp.txt +++ b/ci/conda_env_cpp.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -aws-sdk-cpp +aws-sdk-cpp=1.8.186 benchmark>=1.6.0 boost-cpp>=1.68.0 brotli