Skip to content

Commit c9674bc

Browse files
h-vetinarih-vetinari
authored
GH-37621: [Packaging][Conda] Sync conda recipes with feedstocks (#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 #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: #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>
1 parent aca1d3e commit c9674bc

19 files changed

Lines changed: 151 additions & 177 deletions

‎dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version11.2.yaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
aws_crt_cpp:
2-
- 0.20.3
2+
- 0.23.1
33
aws_sdk_cpp:
4-
- 1.10.57
4+
- 1.11.156
55
bzip2:
66
- '1'
77
c_compiler:
@@ -33,20 +33,18 @@ glog:
3333
google_cloud_cpp:
3434
- '2.12'
3535
libabseil:
36-
- '20230125'
36+
- '20230802'
3737
libgrpc:
38-
- '1.54'
39-
- '1.56'
38+
- '1.57'
4039
libprotobuf:
41-
- '3.21'
42-
- 4.23.3
40+
- 4.23.4
4341
lz4_c:
4442
- 1.9.3
4543
numpy:
46-
- '1.21'
44+
- '1.22'
4745
- '1.23'
48-
- '1.21'
49-
- '1.21'
46+
- '1.22'
47+
- '1.22'
5048
openssl:
5149
- '3'
5250
orc:
@@ -67,7 +65,7 @@ snappy:
6765
target_platform:
6866
- linux-64
6967
thrift_cpp:
70-
- 0.18.1
68+
- 0.19.0
7169
ucx:
7270
- 1.14.0
7371
zip_keys:

‎dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNone.yaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
aws_crt_cpp:
2-
- 0.20.3
2+
- 0.23.1
33
aws_sdk_cpp:
4-
- 1.10.57
4+
- 1.11.156
55
bzip2:
66
- '1'
77
c_compiler:
@@ -33,20 +33,18 @@ glog:
3333
google_cloud_cpp:
3434
- '2.12'
3535
libabseil:
36-
- '20230125'
36+
- '20230802'
3737
libgrpc:
38-
- '1.54'
39-
- '1.56'
38+
- '1.57'
4039
libprotobuf:
41-
- '3.21'
42-
- 4.23.3
40+
- 4.23.4
4341
lz4_c:
4442
- 1.9.3
4543
numpy:
46-
- '1.21'
44+
- '1.22'
4745
- '1.23'
48-
- '1.21'
49-
- '1.21'
46+
- '1.22'
47+
- '1.22'
5048
openssl:
5149
- '3'
5250
orc:
@@ -67,7 +65,7 @@ snappy:
6765
target_platform:
6866
- linux-64
6967
thrift_cpp:
70-
- 0.18.1
68+
- 0.19.0
7169
ucx:
7270
- 1.14.0
7371
zip_keys:

‎dev/tasks/conda-recipes/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
BUILD:
22
- aarch64-conda_cos7-linux-gnu
33
aws_crt_cpp:
4-
- 0.20.3
4+
- 0.23.1
55
aws_sdk_cpp:
6-
- 1.10.57
6+
- 1.11.156
77
bzip2:
88
- '1'
99
c_compiler:
@@ -37,20 +37,18 @@ glog:
3737
google_cloud_cpp:
3838
- '2.12'
3939
libabseil:
40-
- '20230125'
40+
- '20230802'
4141
libgrpc:
42-
- '1.54'
43-
- '1.56'
42+
- '1.57'
4443
libprotobuf:
45-
- '3.21'
46-
- 4.23.3
44+
- 4.23.4
4745
lz4_c:
4846
- 1.9.3
4947
numpy:
50-
- '1.21'
48+
- '1.22'
5149
- '1.23'
52-
- '1.21'
53-
- '1.21'
50+
- '1.22'
51+
- '1.22'
5452
openssl:
5553
- '3'
5654
orc:
@@ -71,7 +69,7 @@ snappy:
7169
target_platform:
7270
- linux-aarch64
7371
thrift_cpp:
74-
- 0.18.1
72+
- 0.19.0
7573
ucx:
7674
- 1.14.0
7775
zip_keys:

‎dev/tasks/conda-recipes/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
BUILD:
22
- aarch64-conda_cos7-linux-gnu
33
aws_crt_cpp:
4-
- 0.20.3
4+
- 0.23.1
55
aws_sdk_cpp:
6-
- 1.10.57
6+
- 1.11.156
77
bzip2:
88
- '1'
99
c_compiler:
@@ -37,20 +37,18 @@ glog:
3737
google_cloud_cpp:
3838
- '2.12'
3939
libabseil:
40-
- '20230125'
40+
- '20230802'
4141
libgrpc:
42-
- '1.54'
43-
- '1.56'
42+
- '1.57'
4443
libprotobuf:
45-
- '3.21'
46-
- 4.23.3
44+
- 4.23.4
4745
lz4_c:
4846
- 1.9.3
4947
numpy:
50-
- '1.21'
48+
- '1.22'
5149
- '1.23'
52-
- '1.21'
53-
- '1.21'
50+
- '1.22'
51+
- '1.22'
5452
openssl:
5553
- '3'
5654
orc:
@@ -71,7 +69,7 @@ snappy:
7169
target_platform:
7270
- linux-aarch64
7371
thrift_cpp:
74-
- 0.18.1
72+
- 0.19.0
7573
ucx:
7674
- 1.14.0
7775
zip_keys:

‎dev/tasks/conda-recipes/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
aws_crt_cpp:
2-
- 0.20.3
2+
- 0.23.1
33
aws_sdk_cpp:
4-
- 1.10.57
4+
- 1.11.156
55
bzip2:
66
- '1'
77
c_compiler:
@@ -33,20 +33,18 @@ glog:
3333
google_cloud_cpp:
3434
- '2.12'
3535
libabseil:
36-
- '20230125'
36+
- '20230802'
3737
libgrpc:
38-
- '1.54'
39-
- '1.56'
38+
- '1.57'
4039
libprotobuf:
41-
- '3.21'
42-
- 4.23.3
40+
- 4.23.4
4341
lz4_c:
4442
- 1.9.3
4543
numpy:
46-
- '1.21'
44+
- '1.22'
4745
- '1.23'
48-
- '1.21'
49-
- '1.21'
46+
- '1.22'
47+
- '1.22'
5048
openssl:
5149
- '3'
5250
orc:
@@ -67,7 +65,7 @@ snappy:
6765
target_platform:
6866
- linux-ppc64le
6967
thrift_cpp:
70-
- 0.18.1
68+
- 0.19.0
7169
ucx:
7270
- 1.14.0
7371
zip_keys:

‎dev/tasks/conda-recipes/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
aws_crt_cpp:
2-
- 0.20.3
2+
- 0.23.1
33
aws_sdk_cpp:
4-
- 1.10.57
4+
- 1.11.156
55
bzip2:
66
- '1'
77
c_compiler:
@@ -33,20 +33,18 @@ glog:
3333
google_cloud_cpp:
3434
- '2.12'
3535
libabseil:
36-
- '20230125'
36+
- '20230802'
3737
libgrpc:
38-
- '1.54'
39-
- '1.56'
38+
- '1.57'
4039
libprotobuf:
41-
- '3.21'
42-
- 4.23.3
40+
- 4.23.4
4341
lz4_c:
4442
- 1.9.3
4543
numpy:
46-
- '1.21'
44+
- '1.22'
4745
- '1.23'
48-
- '1.21'
49-
- '1.21'
46+
- '1.22'
47+
- '1.22'
5048
openssl:
5149
- '3'
5250
orc:
@@ -67,7 +65,7 @@ snappy:
6765
target_platform:
6866
- linux-ppc64le
6967
thrift_cpp:
70-
- 0.18.1
68+
- 0.19.0
7169
ucx:
7270
- 1.14.0
7371
zip_keys:

‎dev/tasks/conda-recipes/.ci_support/osx_64_.yaml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
MACOSX_DEPLOYMENT_TARGET:
2-
- '10.9'
2+
- '10.13'
33
aws_crt_cpp:
4-
- 0.20.3
4+
- 0.23.1
55
aws_sdk_cpp:
6-
- 1.10.57
6+
- 1.11.156
77
bzip2:
88
- '1'
99
c_compiler:
@@ -27,22 +27,20 @@ glog:
2727
google_cloud_cpp:
2828
- '2.12'
2929
libabseil:
30-
- '20230125'
30+
- '20230802'
3131
libgrpc:
32-
- '1.54'
33-
- '1.56'
32+
- '1.57'
3433
libprotobuf:
35-
- '3.21'
36-
- 4.23.3
34+
- 4.23.4
3735
lz4_c:
3836
- 1.9.3
3937
macos_machine:
4038
- x86_64-apple-darwin13.4.0
4139
numpy:
42-
- '1.21'
40+
- '1.22'
4341
- '1.23'
44-
- '1.21'
45-
- '1.21'
42+
- '1.22'
43+
- '1.22'
4644
openssl:
4745
- '3'
4846
orc:
@@ -63,7 +61,7 @@ snappy:
6361
target_platform:
6462
- osx-64
6563
thrift_cpp:
66-
- 0.18.1
64+
- 0.19.0
6765
zip_keys:
6866
- - c_compiler_version
6967
- cxx_compiler_version

‎dev/tasks/conda-recipes/.ci_support/osx_arm64_.yaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
MACOSX_DEPLOYMENT_TARGET:
22
- '11.0'
33
aws_crt_cpp:
4-
- 0.20.3
4+
- 0.23.1
55
aws_sdk_cpp:
6-
- 1.10.57
6+
- 1.11.156
77
bzip2:
88
- '1'
99
c_compiler:
@@ -27,22 +27,20 @@ glog:
2727
google_cloud_cpp:
2828
- '2.12'
2929
libabseil:
30-
- '20230125'
30+
- '20230802'
3131
libgrpc:
32-
- '1.54'
33-
- '1.56'
32+
- '1.57'
3433
libprotobuf:
35-
- '3.21'
36-
- 4.23.3
34+
- 4.23.4
3735
lz4_c:
3836
- 1.9.3
3937
macos_machine:
4038
- arm64-apple-darwin20.0.0
4139
numpy:
42-
- '1.21'
40+
- '1.22'
4341
- '1.23'
44-
- '1.21'
45-
- '1.21'
42+
- '1.22'
43+
- '1.22'
4644
openssl:
4745
- '3'
4846
orc:
@@ -63,7 +61,7 @@ snappy:
6361
target_platform:
6462
- osx-arm64
6563
thrift_cpp:
66-
- 0.18.1
64+
- 0.19.0
6765
zip_keys:
6866
- - c_compiler_version
6967
- cxx_compiler_version

dev/tasks/conda-recipes/.ci_support/r/linux_64_r_base4.1.yaml renamed to dev/tasks/conda-recipes/.ci_support/r/linux_64_r_base4.3.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pin_run_as_build:
1919
min_pin: x.x
2020
max_pin: x.x
2121
r_base:
22-
- '4.1'
22+
- '4.3'
2323
target_platform:
2424
- linux-64
2525
zip_keys:

dev/tasks/conda-recipes/.ci_support/r/linux_aarch64_r_base4.1.yaml renamed to dev/tasks/conda-recipes/.ci_support/r/linux_aarch64_r_base4.3.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pin_run_as_build:
2323
min_pin: x.x
2424
max_pin: x.x
2525
r_base:
26-
- '4.1'
26+
- '4.3'
2727
target_platform:
2828
- linux-aarch64
2929
zip_keys:

0 commit comments

Comments
 (0)