Skip to content

Commit e8db13c

Browse files
ARROW-12246: [CI] Sync conda recipes with upstream feedstock
(I am first trying with linux) Closes #9923 from jorisvandenbossche/ARROW-12246-conda-recipes Lead-authored-by: Uwe L. Korn <[email protected]> Co-authored-by: Joris Van den Bossche <[email protected]> Signed-off-by: Uwe L. Korn <[email protected]>
1 parent a93ebbe commit e8db13c

28 files changed

+557
-314
lines changed

dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.6.____cpython.yaml renamed to dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,42 @@
11
aws_sdk_cpp:
2-
- 1.8.63
3-
boost_cpp:
4-
- 1.74.0
2+
- 1.8.151
53
bzip2:
64
- '1'
75
c_compiler:
86
- gcc
97
c_compiler_version:
10-
- '7'
8+
- '9'
9+
cdt_name:
10+
- cos6
1111
channel_sources:
1212
- conda-forge,defaults
1313
channel_targets:
1414
- conda-forge main
1515
cuda_compiler:
1616
- nvcc
1717
cuda_compiler_version:
18-
- '9.2'
18+
- '10.2'
1919
cxx_compiler:
2020
- gxx
2121
cxx_compiler_version:
22-
- '7'
22+
- '9'
2323
docker_image:
24-
- condaforge/linux-anvil-cuda:9.2
24+
- quay.io/condaforge/linux-anvil-cuda:10.2
2525
gflags:
2626
- '2.2'
2727
glog:
2828
- 0.4.0
2929
grpc_cpp:
30-
- '1.32'
30+
- '1.36'
3131
libprotobuf:
32-
- '3.13'
32+
- '3.15'
3333
lz4_c:
34-
- 1.9.2
34+
- 1.9.3
3535
numpy:
36-
- '1.16'
36+
- '1.17'
3737
orc:
38-
- 1.6.5
38+
- 1.6.7
3939
pin_run_as_build:
40-
boost-cpp:
41-
max_pin: x.x.x
4240
bzip2:
4341
max_pin: x
4442
lz4-c:
@@ -51,18 +49,21 @@ pin_run_as_build:
5149
python:
5250
- 3.6.* *_cpython
5351
re2:
54-
- 2020.10.01
52+
- 2021.04.01
5553
snappy:
5654
- '1'
5755
target_platform:
5856
- linux-64
57+
thrift_cpp:
58+
- 0.14.1
5959
zip_keys:
6060
- - c_compiler_version
6161
- cxx_compiler_version
6262
- - cuda_compiler_version
63+
- cdt_name
6364
- docker_image
64-
- - numpy
65-
- python
65+
- - python
66+
- numpy
6667
zlib:
6768
- '1.2'
6869
zstd:

dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.7.____cpython.yaml renamed to dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,42 @@
11
aws_sdk_cpp:
2-
- 1.8.63
3-
boost_cpp:
4-
- 1.74.0
2+
- 1.8.151
53
bzip2:
64
- '1'
75
c_compiler:
86
- gcc
97
c_compiler_version:
10-
- '7'
8+
- '9'
9+
cdt_name:
10+
- cos6
1111
channel_sources:
1212
- conda-forge,defaults
1313
channel_targets:
1414
- conda-forge main
1515
cuda_compiler:
1616
- nvcc
1717
cuda_compiler_version:
18-
- '9.2'
18+
- '10.2'
1919
cxx_compiler:
2020
- gxx
2121
cxx_compiler_version:
22-
- '7'
22+
- '9'
2323
docker_image:
24-
- condaforge/linux-anvil-cuda:9.2
24+
- quay.io/condaforge/linux-anvil-cuda:10.2
2525
gflags:
2626
- '2.2'
2727
glog:
2828
- 0.4.0
2929
grpc_cpp:
30-
- '1.32'
30+
- '1.36'
3131
libprotobuf:
32-
- '3.13'
32+
- '3.15'
3333
lz4_c:
34-
- 1.9.2
34+
- 1.9.3
3535
numpy:
36-
- '1.16'
36+
- '1.17'
3737
orc:
38-
- 1.6.5
38+
- 1.6.7
3939
pin_run_as_build:
40-
boost-cpp:
41-
max_pin: x.x.x
4240
bzip2:
4341
max_pin: x
4442
lz4-c:
@@ -51,18 +49,21 @@ pin_run_as_build:
5149
python:
5250
- 3.7.* *_cpython
5351
re2:
54-
- 2020.10.01
52+
- 2021.04.01
5553
snappy:
5654
- '1'
5755
target_platform:
5856
- linux-64
57+
thrift_cpp:
58+
- 0.14.1
5959
zip_keys:
6060
- - c_compiler_version
6161
- cxx_compiler_version
6262
- - cuda_compiler_version
63+
- cdt_name
6364
- docker_image
64-
- - numpy
65-
- python
65+
- - python
66+
- numpy
6667
zlib:
6768
- '1.2'
6869
zstd:

dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.8.____cpython.yaml renamed to dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,42 @@
11
aws_sdk_cpp:
2-
- 1.8.63
3-
boost_cpp:
4-
- 1.74.0
2+
- 1.8.151
53
bzip2:
64
- '1'
75
c_compiler:
86
- gcc
97
c_compiler_version:
10-
- '7'
8+
- '9'
9+
cdt_name:
10+
- cos6
1111
channel_sources:
1212
- conda-forge,defaults
1313
channel_targets:
1414
- conda-forge main
1515
cuda_compiler:
1616
- nvcc
1717
cuda_compiler_version:
18-
- '9.2'
18+
- '10.2'
1919
cxx_compiler:
2020
- gxx
2121
cxx_compiler_version:
22-
- '7'
22+
- '9'
2323
docker_image:
24-
- condaforge/linux-anvil-cuda:9.2
24+
- quay.io/condaforge/linux-anvil-cuda:10.2
2525
gflags:
2626
- '2.2'
2727
glog:
2828
- 0.4.0
2929
grpc_cpp:
30-
- '1.32'
30+
- '1.36'
3131
libprotobuf:
32-
- '3.13'
32+
- '3.15'
3333
lz4_c:
34-
- 1.9.2
34+
- 1.9.3
3535
numpy:
36-
- '1.16'
36+
- '1.17'
3737
orc:
38-
- 1.6.5
38+
- 1.6.7
3939
pin_run_as_build:
40-
boost-cpp:
41-
max_pin: x.x.x
4240
bzip2:
4341
max_pin: x
4442
lz4-c:
@@ -51,18 +49,21 @@ pin_run_as_build:
5149
python:
5250
- 3.8.* *_cpython
5351
re2:
54-
- 2020.10.01
52+
- 2021.04.01
5553
snappy:
5654
- '1'
5755
target_platform:
5856
- linux-64
57+
thrift_cpp:
58+
- 0.14.1
5959
zip_keys:
6060
- - c_compiler_version
6161
- cxx_compiler_version
6262
- - cuda_compiler_version
63+
- cdt_name
6364
- docker_image
64-
- - numpy
65-
- python
65+
- - python
66+
- numpy
6667
zlib:
6768
- '1.2'
6869
zstd:

dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.9.____cpython.yaml renamed to dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,42 @@
11
aws_sdk_cpp:
2-
- 1.8.63
3-
boost_cpp:
4-
- 1.74.0
2+
- 1.8.151
53
bzip2:
64
- '1'
75
c_compiler:
86
- gcc
97
c_compiler_version:
10-
- '7'
8+
- '9'
9+
cdt_name:
10+
- cos6
1111
channel_sources:
1212
- conda-forge,defaults
1313
channel_targets:
1414
- conda-forge main
1515
cuda_compiler:
1616
- nvcc
1717
cuda_compiler_version:
18-
- '9.2'
18+
- '10.2'
1919
cxx_compiler:
2020
- gxx
2121
cxx_compiler_version:
22-
- '7'
22+
- '9'
2323
docker_image:
24-
- condaforge/linux-anvil-cuda:9.2
24+
- quay.io/condaforge/linux-anvil-cuda:10.2
2525
gflags:
2626
- '2.2'
2727
glog:
2828
- 0.4.0
2929
grpc_cpp:
30-
- '1.32'
30+
- '1.36'
3131
libprotobuf:
32-
- '3.13'
32+
- '3.15'
3333
lz4_c:
34-
- 1.9.2
34+
- 1.9.3
3535
numpy:
3636
- '1.19'
3737
orc:
38-
- 1.6.5
38+
- 1.6.7
3939
pin_run_as_build:
40-
boost-cpp:
41-
max_pin: x.x.x
4240
bzip2:
4341
max_pin: x
4442
lz4-c:
@@ -51,18 +49,21 @@ pin_run_as_build:
5149
python:
5250
- 3.9.* *_cpython
5351
re2:
54-
- 2020.10.01
52+
- 2021.04.01
5553
snappy:
5654
- '1'
5755
target_platform:
5856
- linux-64
57+
thrift_cpp:
58+
- 0.14.1
5959
zip_keys:
6060
- - c_compiler_version
6161
- cxx_compiler_version
6262
- - cuda_compiler_version
63+
- cdt_name
6364
- docker_image
64-
- - numpy
65-
- python
65+
- - python
66+
- numpy
6667
zlib:
6768
- '1.2'
6869
zstd:

0 commit comments

Comments
 (0)