Merge from 3.x: PR #4613

.travis.yml

@@ -7,20 +7,20 @@ sudo: false
 matrix:
   include:
     - python: "2.7"
-      env: TEST_MODULES=false USE_PYQT=pyqt5
+      env: USE_PYQT=pyqt4
       os: linux
     - python: "2.7"
-      env: TEST_MODULES=true USE_PYQT=pyqt4
+      env: USE_PYQT=pyqt5
       os: linux
     - python: "3.5"
-      env: TEST_MODULES=false USE_PYQT=pyqt4
-      os: linux
-    - python: "3.5"
-      env: TEST_MODULES=true USE_PYQT=pyqt4
+      env: USE_PYQT=pyqt4
       os: linux
     # This slot runs our tests only with pip packages
     - python: "3.5"
-      env: TEST_MODULES=false USE_PYQT=pyqt5
+      env: USE_PYQT=pyqt5
+      os: linux
+    - python: "3.6"
+      env: USE_PYQT=pyqt5
       os: linux
 
 before_install:
@@ -32,14 +32,10 @@ install:
 
 script:
   - |
-    if [ "$TEST_MODULES" = "true" ]; then
-        ./continuous_integration/travis/modules_test.sh
+    if [ "$USE_PYQT" = "pyqt5" ]; then
+        ./continuous_integration/travis/test-qt5.sh || ./continuous_integration/travis/test-qt5.sh
     else
-        if [ "$USE_PYQT" = "pyqt5" ]; then
-            ./continuous_integration/travis/test-qt5.sh
-        else
-            ./continuous_integration/travis/test-qt4.sh
-        fi
+        ./continuous_integration/travis/test-qt4.sh || ./continuous_integration/travis/test-qt4.sh
     fi
 
 after_success:

circle.yml

@@ -3,9 +3,11 @@
 machine:
   environment:
     # Python versions to tests (Maximum of 4 different versions)
-    PY_VERSIONS: "3.5 3.6"
+    PY_VERSIONS: "2.7 3.5 3.6"
     # Environment variable used by astropy helpers
     TRAVIS_OS_NAME: "linux"
+    # PyQt version to test with
+    USE_PYQT: pyqt5
 
 dependencies:
   pre:
@@ -24,5 +26,5 @@ test:
     #- export PATH="$HOME/miniconda/bin:$PATH" && source activate test && ciocheck spyder: # note the colon
     #    parallel: true
     # PyQt5
-    - ./continuous_integration/circle/test-qt5.sh || ./continuous_integration/circle/test-qt5.sh: # note the colon
+    - ./continuous_integration/circle/modules_test.sh || ./continuous_integration/circle/modules_test.sh: # note the colon
         parallel: true

continuous_integration/travis/test-qt5.sh

@@ -12,5 +12,4 @@ else
     conda install -q qt=5.* pyqt=5.* qtconsole matplotlib
 fi
 
-
 python runtests.py

spyder/app/tests/test_mainwindow.py

@@ -131,7 +131,8 @@ def test_change_types_in_varexp(main_window, qtbot):
 
 
 @flaky(max_runs=3)
-@pytest.mark.skipif(os.name != 'nt', reason="It times out on Linux")
+@pytest.mark.skipif(os.name != 'nt' or not PY2,
+                    reason="It times out on Linux and Python 3")
 @pytest.mark.use_introspection
 def test_calltip(main_window, qtbot):
     """Hide the calltip in the editor when a matching ')' is found."""