Merge pull request #17 from DavidMStraub/master

[ci] Finally solve Travis woes by pinning pyqt version to 4
flav-io · Sep 20, 2016 · e50f30e · e50f30e
2 parents 6ab6b17 + 82d151a
commit e50f30e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: python
 python:
-#  - "3.4"
+  - "3.4"
   - "3.5"
 
 notifications:
@@ -20,7 +20,7 @@ before_install:
   - sudo ln -s /run/shm /dev/shm
 
 install:
-  - conda install --yes python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib nose pyqt
+  - conda install --yes python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib nose pyqt=4
   - pip install flavio[sampling,plotting]
   - pip install coveralls