Merge pull request #4230 from ccordoba12/run-tests-on-pyqt4

PR: Run tests for PyQt4 and Python 3.6 on CircleCI

circle.yml

@@ -3,7 +3,7 @@
 machine:
   environment:
     # Python versions to tests (Maximum of 4 different versions)
-    PY_VERSIONS: "2.7 3.4 3.5"
+    PY_VERSIONS: "2.7 3.5 3.6"
     # For Coveralls
     COVERALLS_REPO_TOKEN: yt7YToGxRtnAcM6kSULoiCmOPetq10TaU
     # Environment variables used by astropy helpers
@@ -40,11 +40,8 @@ test:
     #- export PATH="$HOME/miniconda/bin:$PATH" && source activate test && ciocheck spyder: # note the colon
     #    parallel: true
     # PyQt5
-    - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && conda install -q qt=5.* pyqt=5.* qtconsole matplotlib && python runtests.py: # note the colon
-        parallel: true
-    # Coveralls
-    - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && coveralls: # note the colon
+    - ./continuous_integration/circle/test-qt5.sh: # note the colon
         parallel: true
     # PyQt4
-#    - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && conda install qt=4.* pyqt=4.* qtconsole && python runtests.py: # note the colon
-#        parallel: true
+    - ./continuous_integration/circle/test-qt4.sh: # note the colon
+        parallel: true

continuous_integration/circle/test-qt4.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+export PATH="$HOME/miniconda/bin:$PATH"
+
+source activate test
+
+# Only run tests for PyQt4 in Python 2.7 and 3.5
+export PY_VERSIONS=($PY_VERSIONS)
+export PY_VERSION=${PY_VERSIONS[$CIRCLE_NODE_INDEX]}
+
+if [ "$PY_VERSION" = "2.7" ] || [ "$PY_VERSION" = "3.5" ]; then
+    conda install -q qt=4.* pyqt=4.*
+    python runtests.py
+else
+    exit 0
+fi

continuous_integration/circle/test-qt5.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+export PATH="$HOME/miniconda/bin:$PATH"
+
+source activate test
+
+conda install -q qt=5.* pyqt=5.* qtconsole matplotlib
+
+python runtests.py
+
+# Run coveralls also here because there are errors if run
+# as an independent command
+coveralls