Skip to content

Commit 334864c

Browse files
committed
update os-blast-test-matrix.yml to load slycot from conda-forge for windows
1 parent 25ef4a0 commit 334864c

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

.github/scripts/set-conda-test-matrix.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,19 @@
2727
'blas_lib': cbl}
2828
conda_jobs.append(cjob)
2929

30+
# Make sure Windows jobs are included even if we didn't build any
31+
windows_pythons = ['3.11'] # Whatever you want to test
32+
33+
for py in windows_pythons:
34+
for blas in combinations['windows']:
35+
cjob = {
36+
'packagekey': f'windows-{py}',
37+
'os': 'windows',
38+
'python': py,
39+
'blas_lib': blas,
40+
'package_source': 'conda-forge'
41+
}
42+
conda_jobs.append(cjob)
43+
3044
matrix = { 'include': conda_jobs }
3145
print(json.dumps(matrix))

.github/workflows/os-blas-test-matrix.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ jobs:
107107
os:
108108
- 'ubuntu'
109109
- 'macos'
110-
- 'windows'
111110
python:
112111
# build on one, expand matrix in conda-build from the Sylcot/conda-recipe/conda_build_config.yaml
113112
- '3.11'
@@ -332,7 +331,13 @@ jobs:
332331
echo "libblas * *mkl" >> $CONDA_PREFIX/conda-meta/pinned
333332
;;
334333
esac
335-
conda install -c ./slycot-conda-pkgs slycot
334+
if [ "${{ matrix.os }}" = "windows" ]; then
335+
echo "Installing slycot from conda-forge on Windows"
336+
conda install slycot
337+
else
338+
echo "Installing built conda package from local channel"
339+
conda install -c ./slycot-conda-pkgs slycot
340+
fi
336341
conda list
337342
- name: Test with pytest
338343
run: JOBNAME="$JOBNAME" pytest control/tests

0 commit comments

Comments
 (0)