You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ap...@apache.org on 2022/02/08 10:53:39 UTC
[arrow] branch master updated: ARROW-14506: [C++] Conda support for google-cloud-cpp
This is an automated email from the ASF dual-hosted git repository.
apitrou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new d78967e ARROW-14506: [C++] Conda support for google-cloud-cpp
d78967e is described below
commit d78967e25903faa2894bc86b2b2b8fc63711afeb
Author: Uwe L. Korn <uw...@quantco.com>
AuthorDate: Tue Feb 8 11:51:43 2022 +0100
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.
Closes #11916 from coryan/ARROW-14506-add-google-cloud-cpp-to-conda-files
Lead-authored-by: Uwe L. Korn <uw...@quantco.com>
Co-authored-by: Carlos O'Ryan <co...@google.com>
Signed-off-by: Antoine Pitrou <an...@python.org>
---
ci/conda_env_cpp.txt | 6 +-
ci/docker/conda-cpp.dockerfile | 9 ++-
ci/scripts/cpp_build.sh | 1 +
cpp/src/arrow/filesystem/gcsfs.cc | 2 +-
...er_version7numpy1.18python3.7.____cpython.yaml} | 26 +++----
...er_version7numpy1.18python3.8.____cpython.yaml} | 26 +++----
...er_version7numpy1.19python3.9.____cpython.yaml} | 24 +++----
...r_version7numpy1.21python3.10.____cpython.yaml} | 28 ++++----
...er_version9numpy1.18python3.7.____cpython.yaml} | 22 +++---
...er_version9numpy1.18python3.8.____cpython.yaml} | 22 +++---
...er_version9numpy1.19python3.9.____cpython.yaml} | 20 +++---
...r_version9numpy1.21python3.10.____cpython.yaml} | 24 +++----
...ux_aarch64_numpy1.18python3.7.____cpython.yaml} | 21 +++---
...ux_aarch64_numpy1.18python3.8.____cpython.yaml} | 21 +++---
...nux_aarch64_numpy1.19python3.9.____cpython.yaml | 19 ++---
...x_aarch64_numpy1.21python3.10.____cpython.yaml} | 23 ++++---
...ux_ppc64le_numpy1.18python3.7.____cpython.yaml} | 31 ++++-----
...ux_ppc64le_numpy1.18python3.8.____cpython.yaml} | 31 ++++-----
...ux_ppc64le_numpy1.19python3.9.____cpython.yaml} | 29 ++++----
...x_ppc64le_numpy1.21python3.10.____cpython.yaml} | 33 +++++----
... => osx_64_numpy1.18python3.7.____cpython.yaml} | 18 ++---
... => osx_64_numpy1.18python3.8.____cpython.yaml} | 18 ++---
.../osx_64_numpy1.19python3.9.____cpython.yaml | 16 ++---
...=> osx_64_numpy1.21python3.10.____cpython.yaml} | 20 +++---
... osx_arm64_numpy1.19python3.8.____cpython.yaml} | 16 ++---
... osx_arm64_numpy1.19python3.9.____cpython.yaml} | 16 ++---
...osx_arm64_numpy1.21python3.10.____cpython.yaml} | 20 +++---
.../.ci_support/r/linux_64_r_base4.0.yaml | 6 +-
.../.ci_support/r/linux_64_r_base4.1.yaml | 6 +-
.../.ci_support/r/osx_64_r_base4.0.yaml | 2 +-
.../.ci_support/r/osx_64_r_base4.1.yaml | 2 +-
.../.ci_support/r/win_64_r_base4.0.yaml | 2 +-
.../.ci_support/r/win_64_r_base4.1.yaml | 2 +-
...version10.2numpy1.18python3.7.____cpython.yaml} | 22 +++---
...version10.2numpy1.18python3.8.____cpython.yaml} | 22 +++---
...version10.2numpy1.19python3.9.____cpython.yaml} | 20 +++---
...ersion10.2numpy1.21python3.10.____cpython.yaml} | 24 +++----
...versionNonenumpy1.18python3.7.____cpython.yaml} | 20 +++---
...versionNonenumpy1.18python3.8.____cpython.yaml} | 20 +++---
..._versionNonenumpy1.19python3.9.____cpython.yaml | 18 ++---
...ersionNonenumpy1.21python3.10.____cpython.yaml} | 22 +++---
dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh | 7 ++
dev/tasks/conda-recipes/arrow-cpp/build-pyarrow.sh | 5 +-
dev/tasks/conda-recipes/arrow-cpp/meta.yaml | 11 ++-
dev/tasks/conda-recipes/azure.osx.yml | 2 +-
dev/tasks/conda-recipes/azure.win.yml | 14 ++--
dev/tasks/conda-recipes/build_steps.sh | 7 +-
dev/tasks/conda-recipes/r-arrow/meta.yaml | 14 +++-
dev/tasks/tasks.yml | 80 +++++++++++++++++-----
49 files changed, 480 insertions(+), 390 deletions(-)
diff --git a/ci/conda_env_cpp.txt b/ci/conda_env_cpp.txt
index cd7136c..fb53314 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
@@ -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 c9417da..7fe457a 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 \
@@ -57,6 +59,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 4bbfcb7..2e6f359 100755
--- a/ci/scripts/cpp_build.sh
+++ b/ci/scripts/cpp_build.sh
@@ -137,6 +137,7 @@ cmake \
-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE:-OFF} \
-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/cpp/src/arrow/filesystem/gcsfs.cc b/cpp/src/arrow/filesystem/gcsfs.cc
index a61fef2..1f719c3 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<char*>(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<Buffer>(std::move(buffer));
}
//@}
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 3416b95..4273c9b 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 f819ba7..7108ddf 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 3e2e0ef..b5ffa56 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 dfc87c8..ba03ed2 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 ff26bc5..1f10c7e 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 5703aba..0785b14 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 8ff58d7..8d0459d 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 3aba0f1..8430814 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%
copy from dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.7.____cpython.yaml
copy to dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml
index 2b1715d..62676cf 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%
copy from dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.8.____cpython.yaml
copy to dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml
index 5a0e731..fbb0d16 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 16ace00..1620fa4 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%
copy from dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.6.____cpython.yaml
copy to dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml
index 5bb4381..feec3fb 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_aarch64_numpy1.17python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml
similarity index 75%
rename from dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.7.____cpython.yaml
rename to dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml
index 2b1715d..6c1c2c2 100644
--- a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.7.____cpython.yaml
+++ b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml
@@ -1,15 +1,9 @@
-BUILD:
-- aarch64-conda_cos7-linux-gnu
-aws_sdk_cpp:
-- 1.8.186
bzip2:
- '1'
c_compiler:
- gcc
c_compiler_version:
-- '9'
-cdt_arch:
-- aarch64
+- '7'
cdt_name:
- cos7
channel_sources:
@@ -21,23 +15,25 @@ cuda_compiler_version:
cxx_compiler:
- gxx
cxx_compiler_version:
-- '9'
+- '7'
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 +47,19 @@ pin_run_as_build:
python:
- 3.7.* *_cpython
re2:
-- 2021.06.01
+- 2021.11.01
snappy:
- '1'
target_platform:
-- linux-aarch64
+- linux-ppc64le
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_ppc64le_numpy1.18python3.8.____cpython.yaml
similarity index 75%
rename from dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.8.____cpython.yaml
rename to dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml
index 5a0e731..3af41aa 100644
--- a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.8.____cpython.yaml
+++ b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml
@@ -1,15 +1,9 @@
-BUILD:
-- aarch64-conda_cos7-linux-gnu
-aws_sdk_cpp:
-- 1.8.186
bzip2:
- '1'
c_compiler:
- gcc
c_compiler_version:
-- '9'
-cdt_arch:
-- aarch64
+- '7'
cdt_name:
- cos7
channel_sources:
@@ -21,23 +15,25 @@ cuda_compiler_version:
cxx_compiler:
- gxx
cxx_compiler_version:
-- '9'
+- '7'
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 +47,19 @@ pin_run_as_build:
python:
- 3.8.* *_cpython
re2:
-- 2021.06.01
+- 2021.11.01
snappy:
- '1'
target_platform:
-- linux-aarch64
+- linux-ppc64le
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_ppc64le_numpy1.19python3.9.____cpython.yaml
similarity index 76%
copy from dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml
copy to dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml
index 16ace00..a67a971 100644
--- a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml
+++ b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml
@@ -1,15 +1,9 @@
-BUILD:
-- aarch64-conda_cos7-linux-gnu
-aws_sdk_cpp:
-- 1.8.186
bzip2:
- '1'
c_compiler:
- gcc
c_compiler_version:
-- '9'
-cdt_arch:
-- aarch64
+- '7'
cdt_name:
- cos7
channel_sources:
@@ -21,23 +15,25 @@ cuda_compiler_version:
cxx_compiler:
- gxx
cxx_compiler_version:
-- '9'
+- '7'
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 +47,19 @@ pin_run_as_build:
python:
- 3.9.* *_cpython
re2:
-- 2021.06.01
+- 2021.11.01
snappy:
- '1'
target_platform:
-- linux-aarch64
+- linux-ppc64le
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_ppc64le_numpy1.21python3.10.____cpython.yaml
similarity index 73%
rename from dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.6.____cpython.yaml
rename to dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml
index 5bb4381..e79c5d2 100644
--- a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_numpy1.17python3.6.____cpython.yaml
+++ b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml
@@ -1,15 +1,9 @@
-BUILD:
-- aarch64-conda_cos7-linux-gnu
-aws_sdk_cpp:
-- 1.8.186
bzip2:
- '1'
c_compiler:
- gcc
c_compiler_version:
-- '9'
-cdt_arch:
-- aarch64
+- '7'
cdt_name:
- cos7
channel_sources:
@@ -21,23 +15,25 @@ cuda_compiler_version:
cxx_compiler:
- gxx
cxx_compiler_version:
-- '9'
+- '7'
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 +45,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
+- linux-ppc64le
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/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 d2c046a..d062960 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 43f6344..cfd3391 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 7cc730f..d12db70 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 0be59fe..70c8c76 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%
copy from dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.8.____cpython.yaml
copy to dev/tasks/conda-recipes/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml
index e5f8e2b..faafdda 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 cd3eca6..e716199 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_python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml
similarity index 82%
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.21python3.10.____cpython.yaml
index e5f8e2b..dacd303 100644
--- a/dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.8.____cpython.yaml
+++ b/dev/tasks/conda-recipes/.ci_support/osx_arm64_numpy1.21python3.10.____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'
+- '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.8.* *_cpython
+- 3.10.* *_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/r/linux_64_r_base4.0.yaml b/dev/tasks/conda-recipes/.ci_support/r/linux_64_r_base4.0.yaml
index dfdfae9..bb4dbcb 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 c5f455c..00d944c 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 08bb81d..20f3879 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 9974c66..8926fd8 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 02c2a70..bb8f972 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 2fe9ad3..72a5bf3 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:
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.18python3.7.____cpython.yaml
similarity index 79%
copy from dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml
copy to dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.7.____cpython.yaml
index 8da4a83..6944dad 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.18python3.7.____cpython.yaml
@@ -1,17 +1,15 @@
-aws_sdk_cpp:
-- 1.8.186
bzip2:
- '1'
c_compiler:
- vs2017
channel_sources:
-- conda-forge,defaults
+- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
-- None
+- '10.2'
cxx_compiler:
- vs2017
gflags:
@@ -19,13 +17,15 @@ gflags:
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
pin_run_as_build:
bzip2:
max_pin: x
@@ -39,16 +39,16 @@ pin_run_as_build:
python:
- 3.7.* *_cpython
re2:
-- 2021.06.01
+- 2021.11.01
snappy:
- '1'
target_platform:
- win-64
thrift_cpp:
-- 0.14.2
+- 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.17python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.8.____cpython.yaml
similarity index 79%
copy from dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml
copy to dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.18python3.8.____cpython.yaml
index 1980e1b..7c92cdf 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.18python3.8.____cpython.yaml
@@ -1,17 +1,15 @@
-aws_sdk_cpp:
-- 1.8.186
bzip2:
- '1'
c_compiler:
- vs2017
channel_sources:
-- conda-forge,defaults
+- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
-- None
+- '10.2'
cxx_compiler:
- vs2017
gflags:
@@ -19,13 +17,15 @@ gflags:
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
pin_run_as_build:
bzip2:
max_pin: x
@@ -39,16 +39,16 @@ pin_run_as_build:
python:
- 3.8.* *_cpython
re2:
-- 2021.06.01
+- 2021.11.01
snappy:
- '1'
target_platform:
- win-64
thrift_cpp:
-- 0.14.2
+- 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_version10.2numpy1.19python3.9.____cpython.yaml
similarity index 81%
copy from dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml
copy to dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml
index 1106037..f263284 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_version10.2numpy1.19python3.9.____cpython.yaml
@@ -1,17 +1,15 @@
-aws_sdk_cpp:
-- 1.8.186
bzip2:
- '1'
c_compiler:
- vs2017
channel_sources:
-- conda-forge,defaults
+- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
-- None
+- '10.2'
cxx_compiler:
- vs2017
gflags:
@@ -19,13 +17,15 @@ gflags:
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
pin_run_as_build:
bzip2:
max_pin: x
@@ -39,16 +39,16 @@ pin_run_as_build:
python:
- 3.9.* *_cpython
re2:
-- 2021.06.01
+- 2021.11.01
snappy:
- '1'
target_platform:
- win-64
thrift_cpp:
-- 0.14.2
+- 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.17python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml
similarity index 76%
copy from dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml
copy to dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython.yaml
index 8d4e251..4d3980a 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.21python3.10.____cpython.yaml
@@ -1,17 +1,15 @@
-aws_sdk_cpp:
-- 1.8.186
bzip2:
- '1'
c_compiler:
- vs2017
channel_sources:
-- conda-forge,defaults
+- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
-- None
+- '10.2'
cxx_compiler:
- vs2017
gflags:
@@ -19,13 +17,15 @@ gflags:
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
pin_run_as_build:
bzip2:
max_pin: x
@@ -37,18 +37,18 @@ 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:
- win-64
thrift_cpp:
-- 0.14.2
+- 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.17python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython.yaml
similarity index 81%
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_versionNonenumpy1.18python3.7.____cpython.yaml
index 8da4a83..53cfc86 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_versionNonenumpy1.18python3.7.____cpython.yaml
@@ -1,11 +1,9 @@
-aws_sdk_cpp:
-- 1.8.186
bzip2:
- '1'
c_compiler:
- vs2017
channel_sources:
-- conda-forge,defaults
+- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
@@ -19,13 +17,15 @@ gflags:
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
pin_run_as_build:
bzip2:
max_pin: x
@@ -39,16 +39,16 @@ pin_run_as_build:
python:
- 3.7.* *_cpython
re2:
-- 2021.06.01
+- 2021.11.01
snappy:
- '1'
target_platform:
- win-64
thrift_cpp:
-- 0.14.2
+- 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.17python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.18python3.8.____cpython.yaml
similarity index 81%
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_versionNonenumpy1.18python3.8.____cpython.yaml
index 1980e1b..e1c54b4 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_versionNonenumpy1.18python3.8.____cpython.yaml
@@ -1,11 +1,9 @@
-aws_sdk_cpp:
-- 1.8.186
bzip2:
- '1'
c_compiler:
- vs2017
channel_sources:
-- conda-forge,defaults
+- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
@@ -19,13 +17,15 @@ gflags:
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
pin_run_as_build:
bzip2:
max_pin: x
@@ -39,16 +39,16 @@ pin_run_as_build:
python:
- 3.8.* *_cpython
re2:
-- 2021.06.01
+- 2021.11.01
snappy:
- '1'
target_platform:
- win-64
thrift_cpp:
-- 0.14.2
+- 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 1106037..4140f54 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,9 @@
-aws_sdk_cpp:
-- 1.8.186
bzip2:
- '1'
c_compiler:
- vs2017
channel_sources:
-- conda-forge,defaults
+- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
@@ -19,13 +17,15 @@ gflags:
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
pin_run_as_build:
bzip2:
max_pin: x
@@ -39,16 +39,16 @@ pin_run_as_build:
python:
- 3.9.* *_cpython
re2:
-- 2021.06.01
+- 2021.11.01
snappy:
- '1'
target_platform:
- win-64
thrift_cpp:
-- 0.14.2
+- 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.17python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython.yaml
similarity index 78%
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_versionNonenumpy1.21python3.10.____cpython.yaml
index 8d4e251..e90f5cd 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_versionNonenumpy1.21python3.10.____cpython.yaml
@@ -1,11 +1,9 @@
-aws_sdk_cpp:
-- 1.8.186
bzip2:
- '1'
c_compiler:
- vs2017
channel_sources:
-- conda-forge,defaults
+- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
@@ -19,13 +17,15 @@ gflags:
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
pin_run_as_build:
bzip2:
max_pin: x
@@ -37,18 +37,18 @@ 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:
- win-64
thrift_cpp:
-- 0.14.2
+- 0.15.0
zip_keys:
-- - numpy
- - python
+- - python
+ - numpy
zlib:
- '1.2'
zstd:
diff --git a/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh b/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh
index 9e4c02c..37cdd92 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 \
@@ -58,6 +64,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/build-pyarrow.sh b/dev/tasks/conda-recipes/arrow-cpp/build-pyarrow.sh
index f0cf9ce..7c73d36 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
diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
index 48a8629..d87c63a 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
+++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -66,13 +66,15 @@ 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
- c-ares
- gflags
- glog
+ - google-cloud-cpp >=1.34.0
- grpc-cpp
- libprotobuf
- clangdev 10 # [not (osx and arm64)]
@@ -81,6 +83,7 @@ outputs:
- lz4-c
- numpy
- orc # [unix]
+ - openssl
- python
- rapidjson
- re2
@@ -162,6 +165,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:
@@ -182,6 +187,7 @@ outputs:
- cython
- numpy
- python
+ - openssl
- setuptools
- setuptools_scm
- six
@@ -234,6 +240,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:
@@ -255,6 +263,7 @@ outputs:
- cython
- numpy
- python
+ - openssl
- setuptools
- setuptools_scm
- six
diff --git a/dev/tasks/conda-recipes/azure.osx.yml b/dev/tasks/conda-recipes/azure.osx.yml
index 99bb76b..420b52c 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 }}
diff --git a/dev/tasks/conda-recipes/azure.win.yml b/dev/tasks/conda-recipes/azure.win.yml
index a1340a0..814f78a 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 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.
@@ -58,7 +62,8 @@ jobs:
workingDirectory: arrow\dev\tasks\conda-recipes
- script: |
- conda.exe build arrow-cpp parquet-cpp -m .ci_support\%CONFIG%.yaml
+ call activate base
+ conda.exe mambabuild arrow-cpp parquet-cpp -m .ci_support\%CONFIG%.yaml
displayName: Build recipe
workingDirectory: arrow\dev\tasks\conda-recipes
env:
@@ -66,7 +71,8 @@ jobs:
condition: not(contains(variables['CONFIG'], 'vs2008'))
- script: |
- conda.exe build r-arrow -m .ci_support\r\%R_CONFIG%.yaml
+ call activate base
+ conda.exe mambabuild r-arrow -m .ci_support\r\%R_CONFIG%.yaml
displayName: Build recipe
workingDirectory: arrow\dev\tasks\conda-recipes
env:
diff --git a/dev/tasks/conda-recipes/build_steps.sh b/dev/tasks/conda-recipes/build_steps.sh
index 25864c0..dfc468c 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 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}"
@@ -37,7 +38,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 +46,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}"
diff --git a/dev/tasks/conda-recipes/r-arrow/meta.yaml b/dev/tasks/conda-recipes/r-arrow/meta.yaml
index 5f0643b..1a906f3 100644
--- a/dev/tasks/conda-recipes/r-arrow/meta.yaml
+++ b/dev/tasks/conda-recipes/r-arrow/meta.yaml
@@ -11,17 +11,25 @@ source:
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 +40,8 @@ requirements:
- pkg-config # [win]
- r-base
- arrow-cpp {{ version }}
- - r-cpp11
- r-r6
+ - r-cpp11
- r-assertthat
- r-bit64
- r-purrr
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 06f0469..825ff36 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
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
+ 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"),