From a873368f76704ab3805b021239dd32d4aeeaf953 Mon Sep 17 00:00:00 2001
From: Rory Yorke <rory.yorke@gmail.com>
Date: Wed, 6 Jul 2016 19:02:02 +0200
Subject: [PATCH] BuildFix: change Travis build to handle conda changes

Changes:
  - do build and test inside a conda environment
  - specify Python version at conda build stage

These changes triggered by builds failing *without* changes occuring to
HEAD.
---
 .travis.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bbad0cba5..bc8d9652c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,19 +28,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