File tree Expand file tree Collapse file tree 2 files changed +21
-2
lines changed Expand file tree Collapse file tree 2 files changed +21
-2
lines changed Original file line number Diff line number Diff line change 27
27
'blas_lib' : cbl }
28
28
conda_jobs .append (cjob )
29
29
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
+
30
44
matrix = { 'include' : conda_jobs }
31
45
print (json .dumps (matrix ))
Original file line number Diff line number Diff line change @@ -107,7 +107,6 @@ jobs:
107
107
os :
108
108
- ' ubuntu'
109
109
- ' macos'
110
- - ' windows'
111
110
python :
112
111
# build on one, expand matrix in conda-build from the Sylcot/conda-recipe/conda_build_config.yaml
113
112
- ' 3.11'
@@ -332,7 +331,13 @@ jobs:
332
331
echo "libblas * *mkl" >> $CONDA_PREFIX/conda-meta/pinned
333
332
;;
334
333
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
336
341
conda list
337
342
- name : Test with pytest
338
343
run : JOBNAME="$JOBNAME" pytest control/tests
You can’t perform that action at this time.
0 commit comments