Skip to content

Commit d4fc2d0

Browse files
committed
BLD: travis update for new/old scipy + improved slycot
1 parent 05d6bc5 commit d4fc2d0

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

.travis.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,19 @@ cache:
1010

1111
python:
1212
- "2.7"
13-
- "3.3"
14-
- "3.4"
1513
- "3.5"
14+
- "3.6"
15+
16+
# Test against multiple version of SciPy, with and without slycot
17+
#
18+
# Because there were significant changes in SciPy between v0 and v1, we
19+
# test against both of these using the Travis CI environment capability
20+
#
21+
# We also want to test with and without slycot
22+
env:
23+
- SCIPY=0.19.1 SLYCOT=
24+
- SCIPY=0.19.1 SLYCOT=slycot
25+
- SCIPY=1.0.0 SLYCOT=
1626

1727
# install required system libraries
1828
before_install:
@@ -40,16 +50,15 @@ before_install:
4050

4151
# Install packages
4252
install:
43-
- conda build --python "$TRAVIS_PYTHON_VERSION" conda-recipe
44-
- conda install control --use-local
53+
# Install the desired version of SciPy first, w/ or w/out slycot
54+
- conda install scipy==$SCIPY $SLYCOT
55+
- conda install matplotlib
56+
# Don't use conda for installation of control library [preserves scipy]
57+
- python setup.py install
4558

4659
# command to run tests
4760
script:
48-
# Before installing Slycot
49-
- python setup.py test
50-
51-
# Now, get and use Slycot
52-
- conda install slycot
61+
- 'if [ $SLYCOT != "" ]; then python -c "import slycot"; fi'
5362
- coverage run setup.py test
5463

5564
after_success:

0 commit comments

Comments
 (0)