File tree Expand file tree Collapse file tree 1 file changed +18
-9
lines changed Expand file tree Collapse file tree 1 file changed +18
-9
lines changed Original file line number Diff line number Diff line change @@ -10,9 +10,19 @@ cache:
10
10
11
11
python :
12
12
- " 2.7"
13
- - " 3.3"
14
- - " 3.4"
15
13
- " 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=
16
26
17
27
# install required system libraries
18
28
before_install :
@@ -40,16 +50,15 @@ before_install:
40
50
41
51
# Install packages
42
52
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
45
58
46
59
# command to run tests
47
60
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'
53
62
- coverage run setup.py test
54
63
55
64
after_success :
You can’t perform that action at this time.
0 commit comments