ARROW-10049: [C++/Python] Sync conda recipe with conda-forge

Closes #8228 from xhochy/ARROW-100049 Authored-by: Uwe L. Korn <uwelk@xhochy.com> Signed-off-by: Krisztián Szűcs <szucs.krisztian@gmail.com>
apache · Sep 22, 2020 · 40d6475 · 40d6475
1 parent c557ac3
commit 40d6475
Show file tree

Hide file tree

Showing 18 changed files with 156 additions and 59 deletions.
diff --git a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.6.____cpython.yaml
@@ -1,13 +1,15 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+aws_sdk_cpp:
+- 1.7.164
 boost_cpp:
-- '1.72'
+- 1.74.0
 bzip2:
 - '1'
 c_compiler:
 - gcc
 c_compiler_version:
-- '7'
+- '7.5'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -16,10 +18,12 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
+cuda_compiler_version:
+- None
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '7'
+- '7.5'
 docker_image:
 - condaforge/linux-anvil-aarch64
 gflags:
@@ -32,6 +36,8 @@ libprotobuf:
 - '3.12'
 lz4_c:
 - 1.9.2
+numpy:
+- '1.16'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -47,9 +53,11 @@ pin_run_as_build:
 python:
 - 3.6.* *_cpython
 re2:
-- 2020.07.06
+- 2020.08.01
 snappy:
 - '1'
+target_platform:
+- linux-aarch64
 zlib:
 - '1.2'
 zstd:

diff --git a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.7.____cpython.yaml
@@ -1,13 +1,15 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+aws_sdk_cpp:
+- 1.7.164
 boost_cpp:
-- '1.72'
+- 1.74.0
 bzip2:
 - '1'
 c_compiler:
 - gcc
 c_compiler_version:
-- '7'
+- '7.5'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -16,10 +18,12 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
+cuda_compiler_version:
+- None
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '7'
+- '7.5'
 docker_image:
 - condaforge/linux-anvil-aarch64
 gflags:
@@ -32,6 +36,8 @@ libprotobuf:
 - '3.12'
 lz4_c:
 - 1.9.2
+numpy:
+- '1.16'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -47,9 +53,11 @@ pin_run_as_build:
 python:
 - 3.7.* *_cpython
 re2:
-- 2020.07.06
+- 2020.08.01
 snappy:
 - '1'
+target_platform:
+- linux-aarch64
 zlib:
 - '1.2'
 zstd:

diff --git a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.8.____cpython.yaml
@@ -1,13 +1,15 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+aws_sdk_cpp:
+- 1.7.164
 boost_cpp:
-- '1.72'
+- 1.74.0
 bzip2:
 - '1'
 c_compiler:
 - gcc
 c_compiler_version:
-- '7'
+- '7.5'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -16,10 +18,12 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
+cuda_compiler_version:
+- None
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '7'
+- '7.5'
 docker_image:
 - condaforge/linux-anvil-aarch64
 gflags:
@@ -32,6 +36,8 @@ libprotobuf:
 - '3.12'
 lz4_c:
 - 1.9.2
+numpy:
+- '1.16'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -47,9 +53,11 @@ pin_run_as_build:
 python:
 - 3.8.* *_cpython
 re2:
-- 2020.07.06
+- 2020.08.01
 snappy:
 - '1'
+target_platform:
+- linux-aarch64
 zlib:
 - '1.2'
 zstd:

diff --git a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.6.____cpython.yaml
@@ -1,5 +1,7 @@
+aws_sdk_cpp:
+- 1.7.164
 boost_cpp:
-- '1.72'
+- 1.74.0
 bzip2:
 - '1'
 c_compiler:
@@ -30,6 +32,8 @@ libprotobuf:
 - '3.12'
 lz4_c:
 - 1.9.2
+numpy:
+- '1.16'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -45,9 +49,11 @@ pin_run_as_build:
 python:
 - 3.6.* *_cpython
 re2:
-- 2020.07.06
+- 2020.08.01
 snappy:
 - '1'
+target_platform:
+- linux-64
 zip_keys:
 - - cuda_compiler_version
   - docker_image

diff --git a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.7.____cpython.yaml
@@ -1,5 +1,7 @@
+aws_sdk_cpp:
+- 1.7.164
 boost_cpp:
-- '1.72'
+- 1.74.0
 bzip2:
 - '1'
 c_compiler:
@@ -30,6 +32,8 @@ libprotobuf:
 - '3.12'
 lz4_c:
 - 1.9.2
+numpy:
+- '1.16'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -45,9 +49,11 @@ pin_run_as_build:
 python:
 - 3.7.* *_cpython
 re2:
-- 2020.07.06
+- 2020.08.01
 snappy:
 - '1'
+target_platform:
+- linux-64
 zip_keys:
 - - cuda_compiler_version
   - docker_image

diff --git a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.8.____cpython.yaml
@@ -1,5 +1,7 @@
+aws_sdk_cpp:
+- 1.7.164
 boost_cpp:
-- '1.72'
+- 1.74.0
 bzip2:
 - '1'
 c_compiler:
@@ -30,6 +32,8 @@ libprotobuf:
 - '3.12'
 lz4_c:
 - 1.9.2
+numpy:
+- '1.16'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -45,9 +49,11 @@ pin_run_as_build:
 python:
 - 3.8.* *_cpython
 re2:
-- 2020.07.06
+- 2020.08.01
 snappy:
 - '1'
+target_platform:
+- linux-64
 zip_keys:
 - - cuda_compiler_version
   - docker_image

diff --git a/...tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.6.____cpython.yaml b/...tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.6.____cpython.yaml
@@ -1,5 +1,7 @@
+aws_sdk_cpp:
+- 1.7.164
 boost_cpp:
-- '1.72'
+- 1.74.0
 bzip2:
 - '1'
 c_compiler:
@@ -30,6 +32,8 @@ libprotobuf:
 - '3.12'
 lz4_c:
 - 1.9.2
+numpy:
+- '1.16'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -45,9 +49,11 @@ pin_run_as_build:
 python:
 - 3.6.* *_cpython
 re2:
-- 2020.07.06
+- 2020.08.01
 snappy:
 - '1'
+target_platform:
+- linux-64
 zip_keys:
 - - cuda_compiler_version
   - docker_image

diff --git a/...tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.7.____cpython.yaml b/...tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.7.____cpython.yaml
@@ -1,5 +1,7 @@
+aws_sdk_cpp:
+- 1.7.164
 boost_cpp:
-- '1.72'
+- 1.74.0
 bzip2:
 - '1'
 c_compiler:
@@ -30,6 +32,8 @@ libprotobuf:
 - '3.12'
 lz4_c:
 - 1.9.2
+numpy:
+- '1.16'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -45,9 +49,11 @@ pin_run_as_build:
 python:
 - 3.7.* *_cpython
 re2:
-- 2020.07.06
+- 2020.08.01
 snappy:
 - '1'
+target_platform:
+- linux-64
 zip_keys:
 - - cuda_compiler_version
   - docker_image

diff --git a/...tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.8.____cpython.yaml b/...tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.8.____cpython.yaml
@@ -1,5 +1,7 @@
+aws_sdk_cpp:
+- 1.7.164
 boost_cpp:
-- '1.72'
+- 1.74.0
 bzip2:
 - '1'
 c_compiler:
@@ -30,6 +32,8 @@ libprotobuf:
 - '3.12'
 lz4_c:
 - 1.9.2
+numpy:
+- '1.16'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -45,9 +49,11 @@ pin_run_as_build:
 python:
 - 3.8.* *_cpython
 re2:
-- 2020.07.06
+- 2020.08.01
 snappy:
 - '1'
+target_platform:
+- linux-64
 zip_keys:
 - - cuda_compiler_version
   - docker_image

diff --git a/dev/tasks/conda-recipes/.ci_support/osx_python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_python3.6.____cpython.yaml
@@ -1,7 +1,9 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+aws_sdk_cpp:
+- 1.7.164
 boost_cpp:
-- '1.72'
+- 1.74.0
 bzip2:
 - '1'
 c_compiler:
@@ -12,6 +14,8 @@ channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
+cuda_compiler_version:
+- None
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
@@ -28,8 +32,8 @@ lz4_c:
 - 1.9.2
 macos_machine:
 - x86_64-apple-darwin13.4.0
-macos_min_version:
-- '10.9'
+numpy:
+- '1.16'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -45,9 +49,11 @@ pin_run_as_build:
 python:
 - 3.6.* *_cpython
 re2:
-- 2020.07.06
+- 2020.08.01
 snappy:
 - '1'
+target_platform:
+- osx-64
 zlib:
 - '1.2'
 zstd: