Skip to content

Commit 353c3fe

Browse files
committed
Sync conda-recipes with upstream
1 parent 17d0685 commit 353c3fe

17 files changed

+933
-705
lines changed

dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version11.2.yaml renamed to dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
aws_crt_cpp:
2-
- 0.23.1
2+
- 0.26.10
33
aws_sdk_cpp:
4-
- 1.11.156
4+
- 1.11.329
55
bzip2:
66
- '1'
77
c_compiler:
88
- gcc
99
c_compiler_version:
10-
- '10'
10+
- '11'
11+
c_stdlib:
12+
- sysroot
13+
c_stdlib_version:
14+
- '2.17'
1115
cdt_name:
1216
- cos7
1317
channel_sources:
@@ -17,69 +21,54 @@ channel_targets:
1721
cuda_compiler:
1822
- nvcc
1923
cuda_compiler_version:
20-
- '11.2'
24+
- '11.8'
2125
cuda_compiler_version_min:
22-
- '11.2'
26+
- '11.8'
2327
cxx_compiler:
2428
- gxx
2529
cxx_compiler_version:
26-
- '10'
30+
- '11'
2731
docker_image:
28-
- quay.io/condaforge/linux-anvil-cuda:11.2
32+
- quay.io/condaforge/linux-anvil-cuda:11.8
2933
gflags:
3034
- '2.2'
3135
glog:
32-
- '0.6'
33-
google_cloud_cpp:
34-
- '2.12'
36+
- '0.7'
3537
libabseil:
36-
- '20230802'
38+
- '20240116'
39+
libgoogle_cloud_devel:
40+
- '2.24'
41+
libgoogle_cloud_storage_devel:
42+
- '2.24'
3743
libgrpc:
38-
- '1.57'
44+
- '1.62'
3945
libprotobuf:
40-
- 4.23.4
46+
- 4.25.3
4147
lz4_c:
4248
- 1.9.3
43-
numpy:
44-
- '1.22'
45-
- '1.23'
46-
- '1.22'
47-
- '1.22'
4849
openssl:
4950
- '3'
5051
orc:
51-
- 1.9.0
52-
pin_run_as_build:
53-
python:
54-
min_pin: x.x
55-
max_pin: x.x
56-
python:
57-
- 3.10.* *_cpython
58-
- 3.11.* *_cpython
59-
- 3.8.* *_cpython
60-
- 3.9.* *_cpython
52+
- 2.0.1
6153
re2:
62-
- 2023.03.02
54+
- 2023.09.01
6355
snappy:
64-
- '1'
56+
- '1.2'
6557
target_platform:
6658
- linux-64
6759
thrift_cpp:
6860
- 0.19.0
6961
ucx:
70-
- 1.14.0
62+
- 1.16.0
7163
zip_keys:
7264
- - c_compiler_version
7365
- cxx_compiler_version
66+
- c_stdlib_version
67+
- cdt_name
7468
- cuda_compiler
7569
- cuda_compiler_version
76-
- cdt_name
7770
- docker_image
78-
- - libgrpc
79-
- libprotobuf
80-
- - python
81-
- numpy
8271
zlib:
83-
- '1.2'
72+
- '1'
8473
zstd:
8574
- '1.5'

dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNone.yaml renamed to dev/tasks/conda-recipes/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
aws_crt_cpp:
2-
- 0.23.1
2+
- 0.26.10
33
aws_sdk_cpp:
4-
- 1.11.156
4+
- 1.11.329
55
bzip2:
66
- '1'
77
c_compiler:
88
- gcc
99
c_compiler_version:
1010
- '12'
11+
c_stdlib:
12+
- sysroot
13+
c_stdlib_version:
14+
- '2.12'
1115
cdt_name:
1216
- cos6
1317
channel_sources:
@@ -19,7 +23,7 @@ cuda_compiler:
1923
cuda_compiler_version:
2024
- None
2125
cuda_compiler_version_min:
22-
- '11.2'
26+
- '11.8'
2327
cxx_compiler:
2428
- gxx
2529
cxx_compiler_version:
@@ -29,57 +33,42 @@ docker_image:
2933
gflags:
3034
- '2.2'
3135
glog:
32-
- '0.6'
33-
google_cloud_cpp:
34-
- '2.12'
36+
- '0.7'
3537
libabseil:
36-
- '20230802'
38+
- '20240116'
39+
libgoogle_cloud_devel:
40+
- '2.24'
41+
libgoogle_cloud_storage_devel:
42+
- '2.24'
3743
libgrpc:
38-
- '1.57'
44+
- '1.62'
3945
libprotobuf:
40-
- 4.23.4
46+
- 4.25.3
4147
lz4_c:
4248
- 1.9.3
43-
numpy:
44-
- '1.22'
45-
- '1.23'
46-
- '1.22'
47-
- '1.22'
4849
openssl:
4950
- '3'
5051
orc:
51-
- 1.9.0
52-
pin_run_as_build:
53-
python:
54-
min_pin: x.x
55-
max_pin: x.x
56-
python:
57-
- 3.10.* *_cpython
58-
- 3.11.* *_cpython
59-
- 3.8.* *_cpython
60-
- 3.9.* *_cpython
52+
- 2.0.1
6153
re2:
62-
- 2023.03.02
54+
- 2023.09.01
6355
snappy:
64-
- '1'
56+
- '1.2'
6557
target_platform:
6658
- linux-64
6759
thrift_cpp:
6860
- 0.19.0
6961
ucx:
70-
- 1.14.0
62+
- 1.16.0
7163
zip_keys:
7264
- - c_compiler_version
7365
- cxx_compiler_version
66+
- c_stdlib_version
67+
- cdt_name
7468
- cuda_compiler
7569
- cuda_compiler_version
76-
- cdt_name
7770
- docker_image
78-
- - libgrpc
79-
- libprotobuf
80-
- - python
81-
- numpy
8271
zlib:
83-
- '1.2'
72+
- '1'
8473
zstd:
8574
- '1.5'

dev/tasks/conda-recipes/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml renamed to dev/tasks/conda-recipes/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10.yaml

Lines changed: 24 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
BUILD:
22
- aarch64-conda_cos7-linux-gnu
33
aws_crt_cpp:
4-
- 0.23.1
4+
- 0.26.10
55
aws_sdk_cpp:
6-
- 1.11.156
6+
- 1.11.329
77
bzip2:
88
- '1'
99
c_compiler:
1010
- gcc
1111
c_compiler_version:
1212
- '10'
13+
c_stdlib:
14+
- sysroot
15+
c_stdlib_version:
16+
- '2.17'
1317
cdt_arch:
1418
- aarch64
1519
cdt_name:
@@ -21,69 +25,54 @@ channel_targets:
2125
cuda_compiler:
2226
- nvcc
2327
cuda_compiler_version:
24-
- '11.2'
28+
- '11.8'
2529
cuda_compiler_version_min:
26-
- '11.2'
30+
- '11.8'
2731
cxx_compiler:
2832
- gxx
2933
cxx_compiler_version:
3034
- '10'
3135
docker_image:
32-
- quay.io/condaforge/linux-anvil-cuda:11.2
36+
- quay.io/condaforge/linux-anvil-cuda:11.8
3337
gflags:
3438
- '2.2'
3539
glog:
36-
- '0.6'
37-
google_cloud_cpp:
38-
- '2.12'
40+
- '0.7'
3941
libabseil:
40-
- '20230802'
42+
- '20240116'
43+
libgoogle_cloud_devel:
44+
- '2.24'
45+
libgoogle_cloud_storage_devel:
46+
- '2.24'
4147
libgrpc:
42-
- '1.57'
48+
- '1.62'
4349
libprotobuf:
44-
- 4.23.4
50+
- 4.25.3
4551
lz4_c:
4652
- 1.9.3
47-
numpy:
48-
- '1.22'
49-
- '1.23'
50-
- '1.22'
51-
- '1.22'
5253
openssl:
5354
- '3'
5455
orc:
55-
- 1.9.0
56-
pin_run_as_build:
57-
python:
58-
min_pin: x.x
59-
max_pin: x.x
60-
python:
61-
- 3.10.* *_cpython
62-
- 3.11.* *_cpython
63-
- 3.8.* *_cpython
64-
- 3.9.* *_cpython
56+
- 2.0.1
6557
re2:
66-
- 2023.03.02
58+
- 2023.09.01
6759
snappy:
68-
- '1'
60+
- '1.2'
6961
target_platform:
7062
- linux-aarch64
7163
thrift_cpp:
7264
- 0.19.0
7365
ucx:
74-
- 1.14.0
66+
- 1.16.0
7567
zip_keys:
7668
- - c_compiler_version
7769
- cxx_compiler_version
70+
- c_stdlib_version
71+
- cdt_name
7872
- cuda_compiler
7973
- cuda_compiler_version
80-
- cdt_name
8174
- docker_image
82-
- - libgrpc
83-
- libprotobuf
84-
- - python
85-
- numpy
8675
zlib:
87-
- '1.2'
76+
- '1'
8877
zstd:
8978
- '1.5'

0 commit comments

Comments
 (0)