Merge pull request #881 from ioam/pin_sip

Unpinned pyqt on travis
holoviz · Sep 23, 2016 · d457c32 · d457c32
2 parents ebe5f04 + 70f0644
commit d457c32
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -24,8 +24,9 @@ install:
   - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
-  - conda create -q -c scitools -n test-environment python=$TRAVIS_PYTHON_VERSION scipy numpy freetype nose matplotlib bokeh pandas jupyter ipython=4.2.0 param iris xarray pyqt=4.11
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION scipy numpy freetype nose bokeh pandas jupyter ipython=4.2.0 param matplotlib=1.5.1 xarray
   - source activate test-environment
+  - conda install -c conda-forge  -c scitools iris sip=4.18
   - if [[ "$TRAVIS_PYTHON_VERSION" == "3.4" ]]; then
       conda install python=3.4.3;
     fi