Skip to content

Commit e513c13

Browse files
committed
Merge conda-forge/main into rapidsai/main
2 parents cf6627f + 44f5439 commit e513c13

23 files changed

+275
-165
lines changed
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,8 @@ pin_run_as_build:
3434
min_pin: x.x
3535
max_pin: x.x
3636
python:
37-
- 3.10.* *_cpython
38-
- 3.11.* *_cpython
39-
- 3.12.* *_cpython
4037
- 3.8.* *_cpython
41-
- 3.9.* *_cpython
4238
r_base:
43-
- '4.2'
4439
- '4.3'
4540
target_platform:
4641
- linux-64
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,8 @@ pin_run_as_build:
3434
min_pin: x.x
3535
max_pin: x.x
3636
python:
37-
- 3.10.* *_cpython
38-
- 3.11.* *_cpython
39-
- 3.12.* *_cpython
4037
- 3.8.* *_cpython
41-
- 3.9.* *_cpython
4238
r_base:
43-
- '4.2'
4439
- '4.3'
4540
target_platform:
4641
- linux-64
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,8 @@ pin_run_as_build:
3838
min_pin: x.x
3939
max_pin: x.x
4040
python:
41-
- 3.10.* *_cpython
42-
- 3.11.* *_cpython
43-
- 3.12.* *_cpython
4441
- 3.8.* *_cpython
45-
- 3.9.* *_cpython
4642
r_base:
47-
- '4.2'
4843
- '4.3'
4944
target_platform:
5045
- linux-aarch64
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,8 @@ pin_run_as_build:
3838
min_pin: x.x
3939
max_pin: x.x
4040
python:
41-
- 3.10.* *_cpython
42-
- 3.11.* *_cpython
43-
- 3.12.* *_cpython
4441
- 3.8.* *_cpython
45-
- 3.9.* *_cpython
4642
r_base:
47-
- '4.2'
4843
- '4.3'
4944
target_platform:
5045
- linux-aarch64

.ci_support/osx_64_.yaml renamed to .ci_support/osx_64_python3.8.____cpython.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,8 @@ pin_run_as_build:
3434
min_pin: x.x
3535
max_pin: x.x
3636
python:
37-
- 3.10.* *_cpython
38-
- 3.11.* *_cpython
39-
- 3.12.* *_cpython
4037
- 3.8.* *_cpython
41-
- 3.9.* *_cpython
4238
r_base:
43-
- '4.2'
4439
- '4.3'
4540
target_platform:
4641
- osx-64

.ci_support/osx_arm64_.yaml renamed to .ci_support/osx_arm64_python3.8.____cpython.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,8 @@ pin_run_as_build:
3434
min_pin: x.x
3535
max_pin: x.x
3636
python:
37-
- 3.10.* *_cpython
38-
- 3.11.* *_cpython
39-
- 3.12.* *_cpython
4037
- 3.8.* *_cpython
41-
- 3.9.* *_cpython
4238
r_base:
43-
- '4.2'
4439
- '4.3'
4540
target_platform:
4641
- osx-arm64

.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml renamed to .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,8 @@ pin_run_as_build:
2020
python:
2121
min_pin: x.x
2222
max_pin: x.x
23-
r-base:
24-
min_pin: x.x
25-
max_pin: x.x
2623
python:
27-
- 3.10.* *_cpython
28-
- 3.11.* *_cpython
29-
- 3.12.* *_cpython
3024
- 3.8.* *_cpython
31-
- 3.9.* *_cpython
32-
r_base:
33-
- '4.1'
3425
target_platform:
3526
- win-64
3627
zip_keys:

.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml

Lines changed: 0 additions & 38 deletions
This file was deleted.

.github/workflows/conda-build.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,35 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
include:
26-
- CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11
26+
- CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython
2727
UPLOAD_PACKAGES: True
2828
os: ubuntu
2929
runs_on: ['ubuntu-latest']
3030
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8
31-
- CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12
31+
- CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython
3232
UPLOAD_PACKAGES: True
3333
os: ubuntu
3434
runs_on: ['ubuntu-latest']
3535
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
36-
- CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11
36+
- CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython
3737
UPLOAD_PACKAGES: True
3838
os: ubuntu
3939
runs_on: ['ubuntu-latest']
4040
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8
41-
- CONFIG: linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12
41+
- CONFIG: linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython
4242
UPLOAD_PACKAGES: True
4343
os: ubuntu
4444
runs_on: ['ubuntu-latest']
4545
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
46-
- CONFIG: osx_64_
46+
- CONFIG: osx_64_python3.8.____cpython
4747
UPLOAD_PACKAGES: True
4848
os: macos
4949
runs_on: ['macos-13']
50-
- CONFIG: osx_arm64_
50+
- CONFIG: osx_arm64_python3.8.____cpython
5151
UPLOAD_PACKAGES: True
5252
os: macos
5353
runs_on: ['macos-13']
54-
- CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0
55-
UPLOAD_PACKAGES: True
56-
os: windows
57-
runs_on: ['windows-latest']
58-
- CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8
54+
- CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython
5955
UPLOAD_PACKAGES: True
6056
os: windows
6157
runs_on: ['windows-latest']

.scripts/build_steps.sh

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)