Merge pull request #3338 from ccordoba12/qt-56-travis

Testing: Use Qt/PyQt 5.6 packages in Travis
spyder-ide · Aug 2, 2016 · b689475 · b689475
2 parents 11c3eec + 17953b4
commit b689475
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 58 deletions.
diff --git a/continuous_integration/appveyor/run_test.bat b/continuous_integration/appveyor/run_test.bat
@@ -2,11 +2,7 @@
 set TEST_CI_APP=True
 
 :: Set extra packages
-set EXTRA_PACKAGES=pandas sympy pillow
-
-if %USE_QT_API%==PyQt4 (
-    set EXTRA_PACKAGES=%EXTRA_PACKAGES% matplotlib
-)
+set EXTRA_PACKAGES=pandas sympy pillow matplotlib
 
 :: Move to a tmp dir before doing the installation
 mkdir C:\projects\tmp

diff --git a/continuous_integration/conda-recipes/qtconsole/bld.bat b/continuous_integration/conda-recipes/qtconsole/bld.bat
diff --git a/continuous_integration/conda-recipes/qtconsole/build.sh b/continuous_integration/conda-recipes/qtconsole/build.sh
diff --git a/continuous_integration/conda-recipes/qtconsole/meta.yaml b/continuous_integration/conda-recipes/qtconsole/meta.yaml
diff --git a/continuous_integration/conda-recipes/spyder/meta.yaml b/continuous_integration/conda-recipes/spyder/meta.yaml
@@ -21,9 +21,8 @@ requirements:
   run:
     - python
     - python.app  # [osx]
-    - {% if environ.get('USE_QT_API') == 'PyQt4' %} pyqt {% else %} pyqt5 {% endif %}  # [unix]
-    - {% if environ.get('USE_QT_API') == 'PyQt4' %} qt 4.* {% else %} qt 5.* {% endif %}  # [win]
-    - {% if environ.get('USE_QT_API') == 'PyQt4' %} pyqt 4.* {% else %} pyqt 5.* {% endif %}  # [win]
+    - {% if environ.get('USE_QT_API') == 'PyQt4' %} qt 4.* {% else %} qt 5.* {% endif %}
+    - {% if environ.get('USE_QT_API') == 'PyQt4' %} pyqt 4.* {% else %} pyqt 5.* {% endif %}
     - rope 0.9.*  # [py34 or py35]
     - rope  # [py27]
     - pyflakes

diff --git a/continuous_integration/travis/build_test.sh b/continuous_integration/travis/build_test.sh
@@ -7,12 +7,6 @@ if [ "$USE_CONDA" = true ] ; then
     conda info
 
     cd continuous_integration/conda-recipes
-
-    # Custom build of qtconsole for pyqt5
-    if [ "$USE_QT_API" = "PyQt5" ]; then
-        conda build --python $TRAVIS_PYTHON_VERSION qtconsole
-    fi
-
     conda build spyder
 else
     # Print basic testing info
@@ -28,5 +22,5 @@ else
         git checkout master
     fi
 
-    python setup.py bdist_wheel --universal
+    python setup.py bdist_wheel
 fi
diff --git a/continuous_integration/travis/install.sh b/continuous_integration/travis/install.sh
@@ -53,6 +53,9 @@ install_conda()
     # Install testing dependencies
     if [ "$USE_CONDA" = true ]; then
         conda config --add channels spyder-ide;
+        if [ "$USE_QT_API" = "PyQt5" ]; then
+            conda config --add channels qttesting;
+        fi
         echo 'conda-build ==1.18.1' > $HOME/miniconda/conda-meta/pinned;
         conda install conda-build;
         conda create -q -n test-environment python=$PY_VERSION;
@@ -63,10 +66,11 @@ install_conda()
 
 install_pip()
 {
+    # Install PyQt
     if [ "$USE_QT_API" = "PyQt5" ]; then
-        conda install pyqt5;
+        conda install pyqt=5.* qt=5.* -c  qttesting;
     elif [ "$USE_QT_API" = "PyQt4" ]; then
-        conda install pyqt;
+        conda install pyqt=4.* qt=4.*;
     fi
 
     # Install testing packages
@@ -81,6 +85,7 @@ install_pip()
 #==============================================================================
 # Main
 #==============================================================================
+# Download Spyder code
 download_code;
 
 # Use conda even to test pip!

diff --git a/continuous_integration/travis/run_test.sh b/continuous_integration/travis/run_test.sh
@@ -10,14 +10,7 @@ export TEST_CI_APP=True
 # We install them here and not in travis_install.sh to see if
 # Spyder is correctly pulling its deps (some of them are shared
 # with mpl)
-export EXTRA_PACKAGES="nomkl pandas sympy pillow"
-
-
-# Don't install mpl for PyQt5 because it pulls PyQt4
-if [ "$USE_QT_API" = "PyQt4" ]; then
-    EXTRA_PACKAGES+=" matplotlib"
-fi
-
+export EXTRA_PACKAGES="nomkl pandas sympy pillow matplotlib"
 
 # Install our builds of Spyder
 if [ "$USE_CONDA" = true ] ; then