Merge from 3.x: PR #4861

appveyor.yml

@@ -11,7 +11,7 @@ environment:
     CONDA_DEPENDENCIES_FLAGS: "--quiet"
     CONDA_DEPENDENCIES: >
       rope pyflakes sphinx pygments pylint pycodestyle psutil nbconvert
-      qtawesome pickleshare qtpy pyzmq chardet mock pandas pytest
+      qtawesome pickleshare pyzmq chardet mock pandas pytest
       pytest-cov numpydoc scipy pillow qtconsole matplotlib jedi
     PIP_DEPENDENCIES: "pytest-qt pytest-timeout flaky"
 
@@ -37,6 +37,10 @@ install:
   - "powershell ci-helpers/appveyor/install-miniconda.ps1"
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "activate test"
+  # Install qtpy and qtconsole from Github
+  - "pip install git+https://github.com/spyder-ide/qtpy.git"
+  - "conda remove -q -y qtconsole"
+  - "pip install git+https://github.com/jupyter/qtconsole.git"
 
 build: false
 

continuous_integration/travis/install.sh

@@ -8,7 +8,7 @@ if [ "$TRAVIS_PYTHON_VERSION" = "3.5" ] && [ "$USE_PYQT" = "pyqt5" ]; then
 else
     export CONDA_DEPENDENCIES_FLAGS="--quiet"
     export CONDA_DEPENDENCIES="rope pyflakes sphinx pygments pylint psutil nbconvert \
-                               qtawesome pickleshare qtpy pyzmq chardet mock nomkl pandas \
+                               qtawesome pickleshare pyzmq chardet mock nomkl pandas \
                                pytest pytest-cov numpydoc scipy cython pillow jedi pycodestyle"
     export PIP_DEPENDENCIES="coveralls pytest-qt pytest-timeout flaky"
 fi
@@ -23,7 +23,15 @@ export PATH="$HOME/miniconda/bin:$PATH"
 source activate test
 
 
+# Install qtpy from Github
+pip install git+https://github.com/spyder-ide/qtpy.git
+
+
 # We test with pip packages in Python 3.5 and PyQt5
 if [ "$TRAVIS_PYTHON_VERSION" = "3.5" ] && [ "$USE_PYQT" = "pyqt5" ]; then
+    # Install qtconsole from Github
+    pip install git+https://github.com/jupyter/qtconsole.git
+
+    # Install Spyder and its dependencies
     pip install -q -e .[test]
 fi

continuous_integration/travis/test-qt4.sh

@@ -6,4 +6,8 @@ source activate test
 pip uninstall -q -y pytest-xvfb
 conda install -q qt=4.* pyqt=4.* qtconsole matplotlib
 
+# Install qtconsole from Github
+conda remove -q -y qtconsole
+pip install git+https://github.com/jupyter/qtconsole.git
+
 python runtests.py

continuous_integration/travis/test-qt5.sh

@@ -10,6 +10,10 @@ if [ "$TRAVIS_PYTHON_VERSION" = "3.5" ] && [ "$USE_PYQT" = "pyqt5" ]; then
     pip install -q pyqt5
 else
     conda install -q qt=5.* pyqt=5.* qtconsole matplotlib
+
+    # Install qtconsole from Github
+    conda remove -q -y qtconsole
+    pip install git+https://github.com/jupyter/qtconsole.git
 fi
 
 python runtests.py