Skip to content

Commit

Permalink
apacheGH-37621: [Packaging][Conda] Sync conda recipes with feedstocks (
Browse files Browse the repository at this point in the history
…apache#37624)

Syncing after the release of 13.0.0 + a couple of migrations (state as of conda-forge/arrow-cpp-feedstock#1168 & conda-forge/r-arrow-feedstock#68)

Relevant updates:
* we're not building twice for different protobuf versions anymore
* new abseil version (fixes apache#36908)
* we've finally upgraded the aws-sdk to 1.11
* the default R versions (on unix) are now 4.2 & 4.3.

Also some further hardening of the activation scripts & clean-ups for dependencies & test skips.
* Closes: apache#37621

Lead-authored-by: H. Vetinari <h.vetinari@gmx.com>
Co-authored-by: h-vetinari <h.vetinari@gmx.com>
Signed-off-by: Joris Van den Bossche <jorisvandenbossche@gmail.com>
  • Loading branch information
h-vetinari authored and etseidl committed Sep 28, 2023
1 parent 9f8638a commit 405d880
Show file tree
Hide file tree
Showing 19 changed files with 151 additions and 177 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
aws_crt_cpp:
- 0.20.3
- 0.23.1
aws_sdk_cpp:
- 1.10.57
- 1.11.156
bzip2:
- '1'
c_compiler:
Expand Down Expand Up @@ -33,20 +33,18 @@ glog:
google_cloud_cpp:
- '2.12'
libabseil:
- '20230125'
- '20230802'
libgrpc:
- '1.54'
- '1.56'
- '1.57'
libprotobuf:
- '3.21'
- 4.23.3
- 4.23.4
lz4_c:
- 1.9.3
numpy:
- '1.21'
- '1.22'
- '1.23'
- '1.21'
- '1.21'
- '1.22'
- '1.22'
openssl:
- '3'
orc:
Expand All @@ -67,7 +65,7 @@ snappy:
target_platform:
- linux-64
thrift_cpp:
- 0.18.1
- 0.19.0
ucx:
- 1.14.0
zip_keys:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
aws_crt_cpp:
- 0.20.3
- 0.23.1
aws_sdk_cpp:
- 1.10.57
- 1.11.156
bzip2:
- '1'
c_compiler:
Expand Down Expand Up @@ -33,20 +33,18 @@ glog:
google_cloud_cpp:
- '2.12'
libabseil:
- '20230125'
- '20230802'
libgrpc:
- '1.54'
- '1.56'
- '1.57'
libprotobuf:
- '3.21'
- 4.23.3
- 4.23.4
lz4_c:
- 1.9.3
numpy:
- '1.21'
- '1.22'
- '1.23'
- '1.21'
- '1.21'
- '1.22'
- '1.22'
openssl:
- '3'
orc:
Expand All @@ -67,7 +65,7 @@ snappy:
target_platform:
- linux-64
thrift_cpp:
- 0.18.1
- 0.19.0
ucx:
- 1.14.0
zip_keys:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
aws_crt_cpp:
- 0.20.3
- 0.23.1
aws_sdk_cpp:
- 1.10.57
- 1.11.156
bzip2:
- '1'
c_compiler:
Expand Down Expand Up @@ -37,20 +37,18 @@ glog:
google_cloud_cpp:
- '2.12'
libabseil:
- '20230125'
- '20230802'
libgrpc:
- '1.54'
- '1.56'
- '1.57'
libprotobuf:
- '3.21'
- 4.23.3
- 4.23.4
lz4_c:
- 1.9.3
numpy:
- '1.21'
- '1.22'
- '1.23'
- '1.21'
- '1.21'
- '1.22'
- '1.22'
openssl:
- '3'
orc:
Expand All @@ -71,7 +69,7 @@ snappy:
target_platform:
- linux-aarch64
thrift_cpp:
- 0.18.1
- 0.19.0
ucx:
- 1.14.0
zip_keys:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
aws_crt_cpp:
- 0.20.3
- 0.23.1
aws_sdk_cpp:
- 1.10.57
- 1.11.156
bzip2:
- '1'
c_compiler:
Expand Down Expand Up @@ -37,20 +37,18 @@ glog:
google_cloud_cpp:
- '2.12'
libabseil:
- '20230125'
- '20230802'
libgrpc:
- '1.54'
- '1.56'
- '1.57'
libprotobuf:
- '3.21'
- 4.23.3
- 4.23.4
lz4_c:
- 1.9.3
numpy:
- '1.21'
- '1.22'
- '1.23'
- '1.21'
- '1.21'
- '1.22'
- '1.22'
openssl:
- '3'
orc:
Expand All @@ -71,7 +69,7 @@ snappy:
target_platform:
- linux-aarch64
thrift_cpp:
- 0.18.1
- 0.19.0
ucx:
- 1.14.0
zip_keys:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
aws_crt_cpp:
- 0.20.3
- 0.23.1
aws_sdk_cpp:
- 1.10.57
- 1.11.156
bzip2:
- '1'
c_compiler:
Expand Down Expand Up @@ -33,20 +33,18 @@ glog:
google_cloud_cpp:
- '2.12'
libabseil:
- '20230125'
- '20230802'
libgrpc:
- '1.54'
- '1.56'
- '1.57'
libprotobuf:
- '3.21'
- 4.23.3
- 4.23.4
lz4_c:
- 1.9.3
numpy:
- '1.21'
- '1.22'
- '1.23'
- '1.21'
- '1.21'
- '1.22'
- '1.22'
openssl:
- '3'
orc:
Expand All @@ -67,7 +65,7 @@ snappy:
target_platform:
- linux-ppc64le
thrift_cpp:
- 0.18.1
- 0.19.0
ucx:
- 1.14.0
zip_keys:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
aws_crt_cpp:
- 0.20.3
- 0.23.1
aws_sdk_cpp:
- 1.10.57
- 1.11.156
bzip2:
- '1'
c_compiler:
Expand Down Expand Up @@ -33,20 +33,18 @@ glog:
google_cloud_cpp:
- '2.12'
libabseil:
- '20230125'
- '20230802'
libgrpc:
- '1.54'
- '1.56'
- '1.57'
libprotobuf:
- '3.21'
- 4.23.3
- 4.23.4
lz4_c:
- 1.9.3
numpy:
- '1.21'
- '1.22'
- '1.23'
- '1.21'
- '1.21'
- '1.22'
- '1.22'
openssl:
- '3'
orc:
Expand All @@ -67,7 +65,7 @@ snappy:
target_platform:
- linux-ppc64le
thrift_cpp:
- 0.18.1
- 0.19.0
ucx:
- 1.14.0
zip_keys:
Expand Down
22 changes: 10 additions & 12 deletions dev/tasks/conda-recipes/.ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
aws_crt_cpp:
- 0.20.3
- 0.23.1
aws_sdk_cpp:
- 1.10.57
- 1.11.156
bzip2:
- '1'
c_compiler:
Expand All @@ -27,22 +27,20 @@ glog:
google_cloud_cpp:
- '2.12'
libabseil:
- '20230125'
- '20230802'
libgrpc:
- '1.54'
- '1.56'
- '1.57'
libprotobuf:
- '3.21'
- 4.23.3
- 4.23.4
lz4_c:
- 1.9.3
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.21'
- '1.22'
- '1.23'
- '1.21'
- '1.21'
- '1.22'
- '1.22'
openssl:
- '3'
orc:
Expand All @@ -63,7 +61,7 @@ snappy:
target_platform:
- osx-64
thrift_cpp:
- 0.18.1
- 0.19.0
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
20 changes: 9 additions & 11 deletions dev/tasks/conda-recipes/.ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
aws_crt_cpp:
- 0.20.3
- 0.23.1
aws_sdk_cpp:
- 1.10.57
- 1.11.156
bzip2:
- '1'
c_compiler:
Expand All @@ -27,22 +27,20 @@ glog:
google_cloud_cpp:
- '2.12'
libabseil:
- '20230125'
- '20230802'
libgrpc:
- '1.54'
- '1.56'
- '1.57'
libprotobuf:
- '3.21'
- 4.23.3
- 4.23.4
lz4_c:
- 1.9.3
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.21'
- '1.22'
- '1.23'
- '1.21'
- '1.21'
- '1.22'
- '1.22'
openssl:
- '3'
orc:
Expand All @@ -63,7 +61,7 @@ snappy:
target_platform:
- osx-arm64
thrift_cpp:
- 0.18.1
- 0.19.0
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
r_base:
- '4.1'
- '4.3'
target_platform:
- linux-64
zip_keys:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
r_base:
- '4.1'
- '4.3'
target_platform:
- linux-aarch64
zip_keys:
Expand Down
Loading

0 comments on commit 405d880

Please sign in to comment.