Merge from 3.x: PRs #4345 and #4346

appveyor.yml

@@ -1,26 +1,26 @@
-# https://ci.appveyor.com/project/ccordoba12/spyder
+# https://ci.appveyor.com/project/spyder-ide/spyder
 
 environment:
-  matrix:
-    - PYTHON:         "C:\\Python27_64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH:    "64"
-      USE_QT_API:     "PyQt5"
 
-    - PYTHON:         "C:\\Python35_64"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH:    "64"
-      USE_QT_API:     "PyQt5"
+  global:
+    PYTHON: "C:\\conda"
+    MINICONDA_VERSION: "latest"
+    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers\\appveyor\\windows_sdk.cmd"
+    PYTHON_ARCH: "64"
+    PIP_DEPENDENCIES_FLAGS: "-q"
+    CONDA_DEPENDENCIES_FLAGS: "--quiet"
+    CONDA_DEPENDENCIES: >
+      rope pyflakes sphinx pygments pylint pycodestyle psutil nbconvert
+      qtawesome pickleshare qtpy pyzmq chardet mock pandas pytest
+      pytest-cov numpydoc scipy pillow qtconsole matplotlib
+    PIP_DEPENDENCIES: "pytest-qt flaky jedi"
 
-    #- PYTHON:         "C:\\Python35_64"
-    #  PYTHON_VERSION: "3.5"
-    #  PYTHON_ARCH:    "64"
-    #  USE_QT_API:     "PyQt4"
+  matrix:
+    - PYTHON_VERSION: "2.7"
+    - PYTHON_VERSION: "3.6"
 
-    #- PYTHON:         "C:\\Python27_64"
-    #  PYTHON_VERSION: "2.7"
-    #  PYTHON_ARCH:    "64"
-    #  USE_QT_API:     "PyQt4"
+platform:
+  -x64
 
 install:
   # If there is a newer build queued for the same PR, cancel this one.
@@ -32,13 +32,12 @@ install:
       https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
       Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
         throw "There are newer queued builds for this pull request, failing early." }
-  - powershell .\\continuous_integration\\appveyor\\install.ps1
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\Library\\bin;%PATH%"
+  - "git clone git://github.com/astropy/ci-helpers.git"
+  - "powershell ci-helpers/appveyor/install-miniconda.ps1"
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - "activate test"
 
 build: false
 
 test_script:
-  - "%CMD_IN_ENV% %APPVEYOR_BUILD_FOLDER%\\continuous_integration\\appveyor\\build_test.bat"
-  - "%CMD_IN_ENV% %APPVEYOR_BUILD_FOLDER%\\continuous_integration\\appveyor\\run_test.bat"
-  - "%CMD_IN_ENV% %APPVEYOR_BUILD_FOLDER%\\continuous_integration\\appveyor\\modules_test.bat"
-  - cd %APPVEYOR_BUILD_FOLDER% & python runtests.py
+  - "%CMD_IN_ENV% python runtests.py"

spyder/plugins/tests/test_ipythonconsole.py

@@ -12,9 +12,11 @@
 
 from flaky import flaky
 import pytest
+from qtpy import PYQT5
 from qtpy.QtCore import Qt, QTimer
 from qtpy.QtWidgets import QApplication
 
+from spyder.py3compat import PY2
 from spyder.plugins.ipythonconsole import (IPythonConsole,
                                            KernelConnectionDialog)
 from spyder.utils.test import close_message_box
@@ -90,7 +92,8 @@ def add(x, y):
 
 
 @flaky(max_runs=10)
-@pytest.mark.skipif(os.name == 'nt', reason="It times out on Windows")
+@pytest.mark.skipif(os.name == 'nt' or (PY2 and PYQT5),
+                    reason="It times out frequently")
 def test_mpl_backend_change(ipyconsole, qtbot):
     """
     Test that Matplotlib backend is changed correctly when

spyder/utils/tests/test_dochelpers.py

@@ -20,16 +20,17 @@
 
 
 PY34 = sys.version.startswith('3.4')
+PY36 = sys.version.startswith('3.6')
 
 
 class Test(object):
     def method(self, x, y=2):
         pass
 
 
-@pytest.mark.skipif(not 'Continuum' in sys.version or PY34,
+@pytest.mark.skipif(not 'Continuum' in sys.version or PY34 or PY36,
                     reason="It fails when not run in Anaconda and in "
-                            "Python 3.4")
+                            "Python 3.4 or 3.6")
 def test_dochelpers():
     """Test dochelpers."""
     assert not getargtxt(Test.__init__)