Merge branch 'travis-fix'

Author: nicoddemus

.travis.yml

@@ -14,19 +14,8 @@ env:
  - PYTEST_VERSION=2.6.0 PYTEST_QT_FORCE_PYQT=false
 
 install:
- # PySide
- - if [[ "$PYTEST_QT_FORCE_PYQT" == "false" && "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
- -     sudo apt-get install -qq python-pyside;
- - elif [[ "$PYTEST_QT_FORCE_PYQT" == "false" && "$TRAVIS_PYTHON_VERSION" == "3.2" ]]; then
- -     sudo apt-get install -qq python3-pyside;
- - fi
-
- # PyQt4
- - if [[ "$PYTEST_QT_FORCE_PYQT" == "true" && "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
- -   sudo apt-get install -qq python-qt4
- - elif [[ "$PYTEST_QT_FORCE_PYQT" == "true" && "$TRAVIS_PYTHON_VERSION" == "3.2" ]]; then
- -   sudo apt-get install -qq python3-pyqt4
- - fi
+ # Qt
+ - python install-qt.py
 
  # PyTest
  - pip uninstall -y pytest

install-qt.py

@@ -0,0 +1,25 @@
+'''
+Simple script to install PyQt or PySide based on PYTEST_QT_FORCE_PYQT
+and python version. Meant to be used in travis-ci.
+'''
+import os
+import sys
+
+def run(cmd):
+    print(cmd)
+    r = os.system(cmd)
+    if r != 0:
+        sys.exit('command %s failed with status %s' % (cmd, r))
+
+py3k = sys.version_info[0] == 3
+if os.environ['PYTEST_QT_FORCE_PYQT'] == "true":
+    if py3k:
+        run('sudo apt-get install -qq python3-pyqt4')
+    else:
+        run('sudo apt-get install -qq python-qt4')
+else:
+    if py3k:
+        run('sudo apt-get install -qq python3-pyside')
+    else:
+        run('sudo apt-get install -qq python-pyside')
+