Merge remote-tracking branch 'refs/remotes/python-control/master'

mp4096 · mp4096 · commit f75f9d4e3db1 · 2016-08-13T18:34:31.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.5"
 
 # install required system libraries
 before_install:
@@ -28,19 +29,24 @@ before_install:
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
-  - conda install --yes python=$TRAVIS_PYTHON_VERSION conda-build pip coverage
+  # conda-build must be installed in the conda root environment
+  - conda install conda-build
+  # TODO: point at conda.anaconda.org?
   - conda config --add channels http://conda.binstar.org/cwrowley
   - conda info -a
+  - conda create -q -n test-environment python="$TRAVIS_PYTHON_VERSION" pip coverage slycot
+  - source activate test-environment
+  # coveralls not in conda repos
+  - pip install coveralls
 
 # Install packages
 install:
-  - conda install slycot
-  - conda build conda-recipe
+  - conda build --python "$TRAVIS_PYTHON_VERSION" conda-recipe
   - conda install control --use-local
-  - pip install coveralls
 
 # command to run tests
 script:
   - coverage run setup.py test
+
 after_success:
   - coveralls
