Skip to content

Commit 68de14a

Browse files
committed
fix conda-forge workflow build matrices
1 parent 2f7315c commit 68de14a

2 files changed

Lines changed: 36 additions & 10 deletions

File tree

.github/workflows/conda-package-cf.yml

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,18 @@ jobs:
1818
runs-on: ubuntu-latest
1919
strategy:
2020
matrix:
21-
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
21+
include:
22+
- python: "3.10"
23+
numpy: "2.2"
24+
- python: "3.11"
25+
numpy: "2.3"
26+
- python: "3.12"
27+
numpy: "2.3"
28+
- python: "3.13"
29+
numpy: "2.3"
30+
- python: "3.14"
31+
numpy: "2.3"
32+
2233
steps:
2334
- name: Cancel Previous Runs
2435
uses: styfle/cancel-workflow-action@3155a141048f8f89c06b4cdae32e7853e97536bc # 0.13.0
@@ -50,17 +61,17 @@ jobs:
5061
- name: Install conda-build
5162
run: conda install conda-build
5263

53-
- name: Build conda package
64+
- name: Build conda package with NumPy 2.x
5465
run: |
55-
CHANNELS="-c conda-forge --override-channels"
56-
VERSIONS="--python ${{ matrix.python }}"
57-
TEST="--no-test"
66+
CHANNELS=(-c conda-forge --override-channels)
67+
VERSIONS=(--python "${{ matrix.python }}" --numpy "${{ matrix.numpy }}")
68+
TEST=(--no-test)
5869
echo "CONDA_BLD=${CONDA}/conda-bld/linux-64" >> $GITHUB_ENV
5970
6071
conda build \
61-
$TEST \
62-
$VERSIONS \
63-
$CHANNELS \
72+
"${TEST[@]}" \
73+
"${VERSIONS[@]}" \
74+
"${CHANNELS[@]}" \
6475
conda-recipe-cf
6576
6677
- name: Upload artifact
@@ -76,6 +87,7 @@ jobs:
7687
strategy:
7788
matrix:
7889
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
90+
numpy: ['numpy">2"']
7991
experimental: [false]
8092
runner: [ubuntu-latest]
8193
continue-on-error: ${{ matrix.experimental }}
@@ -146,7 +158,18 @@ jobs:
146158

147159
strategy:
148160
matrix:
149-
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
161+
include:
162+
- python: "3.10"
163+
numpy: "2.2"
164+
- python: "3.11"
165+
numpy: "2.3"
166+
- python: "3.12"
167+
numpy: "2.3"
168+
- python: "3.13"
169+
numpy: "2.3"
170+
- python: "3.14"
171+
numpy: "2.3"
172+
150173
env:
151174
conda-bld: C:\Miniconda\conda-bld\win-64\
152175
steps:
@@ -193,7 +216,7 @@ jobs:
193216
- name: Build conda package
194217
run: |
195218
conda activate
196-
conda build --no-test --python ${{ matrix.python }} -c conda-forge --override-channels conda-recipe-cf
219+
conda build --no-test --python ${{ matrix.python }} --numpy ${{ matrix.numpy }} -c conda-forge --override-channels conda-recipe-cf
197220
198221
- name: Upload artifact
199222
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
@@ -210,6 +233,7 @@ jobs:
210233
strategy:
211234
matrix:
212235
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
236+
numpy: ['numpy">2"']
213237
experimental: [false]
214238
runner: [windows-latest]
215239
continue-on-error: ${{ matrix.experimental }}

conda-recipe-cf/meta.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ requirements:
3232
- mkl-devel
3333
- tbb-devel
3434
- numpy
35+
- wheel >=0.41.3
3536
run:
3637
- python
3738
- python-gil # [py>=314]
3839
- mkl-service
40+
- {{ pin_compatible('numpy') }}
3941
- {{ pin_compatible('intel-cmplr-lib-rt') }}
4042

4143
test:

0 commit comments

Comments
 (0)