Commitf66d842

authored

Merge pull request#210 from murrayrm/fix_travis-slycot

use openblas instead of lapack for slycot testing

2 parents601b581 +eb89ac9 commitf66d842Copy full SHA for f66d842

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,9 @@ env:`
`28`	`28`	`before_install:`
`29`	`29`	`# Install gfortran for testing slycot; use apt-get instead of conda in`
`30`	`30`	`# order to include the proper CXXABI dependency (updated in GCC 4.9)`
`31`		`-# Also need to include liblapack here, to make sure paths are right`
`32`	`31`	`-if [[ "$SLYCOT" != "" ]]; then`
`33`	`32`	`sudo apt-get update -qq;`
`34`		`-sudo apt-get install gfortran liblapack-dev;`
	`33`	`+sudo apt-get install gfortran;`
`35`	`34`	`fi`
`36`	`35`	`# Install display manager to allow testing of plotting functions`
`37`	`36`	`-export DISPLAY=:99.0`
`@@ -51,6 +50,10 @@ before_install:`
`51`	`50`	`-conda info -a`
`52`	`51`	`-conda create -q -n test-environment python="$TRAVIS_PYTHON_VERSION" pip coverage`
`53`	`52`	`-source activate test-environment`
	`53`	`+# Install openblas if slycot is being used`
	`54`	`+ -if [[ "$SLYCOT" != "" ]]; then`
	`55`	`+conda install openblas;`
	`56`	`+fi`
`54`	`57`	`# Make sure to look in the right place for python libraries (for slycot)`
`55`	`58`	`-export LIBRARY_PATH="$HOME/miniconda/envs/test-environment/lib"`
`56`	`59`	`# coveralls not in conda repos => install via pip instead`

Comments

(0)