Merge pull request #667 from bnavigator/conda-mkl-workaround · python-control/python-control@e9c224c

Commit e9c224c

authored

Merge pull request #667 from bnavigator/conda-mkl-workaround

Use conda-forge for numpy and co.

2 parents b61f58d + 87db91b commit e9c224c

lines changed

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ jobs:`
`36`	`36`	`pip install coveralls`
`37`	`37`
`38`	`38`	`# Install python-control dependencies`
`39`		`- conda install numpy matplotlib scipy`
	`39`	`+ # use conda-forge until https://github.com/numpy/numpy/issues/20233 is resolved`
	`40`	`+ conda install -c conda-forge numpy matplotlib scipy`
`40`	`41`	`if [[ '${{matrix.slycot}}' == 'conda' ]]; then`
`41`	`42`	`conda install -c conda-forge slycot`
`42`	`43`	`fi`

Comments

(0)