Skip to content

Commit 4455818

Browse files
committed
update os-blast-test-matrix.yml to load slycot from conda-forge for windows
1 parent e198074 commit 4455818

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

.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

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ build-backend = "setuptools.build_meta"
1010
name = "control"
1111
description = "Python Control Systems Library"
1212
authors = [{name = "Python Control Developers", email = "python-control-developers@lists.sourceforge.net"}]
13-
license = {text = "BSD-3-Clause"}
13+
license = "BSD-3-Clause"
1414
readme = "README.rst"
1515
classifiers = [
1616
"Development Status :: 4 - Beta",

0 commit comments

Comments
 (0)