Merge pull request #61 from ccordoba12/fix-cis

Fix errors in CI services

Author: ccordoba12

.travis.yml

@@ -15,12 +15,15 @@ matrix:
     - python: "2.7"
       env: USE_QT_API=PyQt4
       os: linux
-    #- python: "2.7"
-    #  env: USE_QT_API=PySide
-    #  os: linux
+    - python: "2.7"
+      env: USE_QT_API=PySide
+      os: linux
     - python: "3.4"
       env: USE_QT_API=PyQt4
       os: linux
+    - python: "3.4"
+      env: USE_QT_API=PyQt5
+      os: linux
     - python: "3.5"
       env: USE_QT_API=PyQt5
       os: linux
@@ -56,12 +59,11 @@ install:
 
   # Test environments for different Qt bindings
   - if [[ "$USE_QT_API" == "PyQt5" ]]; then
-      conda config --add channels spyder-ide;
-      conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION qt5 pyqt5;
+      conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION qt=5.* pyqt=5.*;
     elif [[ "$USE_QT_API" == "PyQt4" ]]; then
-      conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION qt pyqt;
+      conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION qt=4.* pyqt=4.*;
     elif [[ "$USE_QT_API" == "PySide" ]]; then
-      conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION qt pyside;
+      conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION qt=4.* pyside;
     fi
   - source activate test-environment
   - python setup.py install

appveyor.yml

@@ -22,13 +22,6 @@ environment:
       CONDA_DEPENDENCIES: "qt=5.* pyqt=5.*"
     - PYTHON_VERSION: "2.7"
       CONDA_DEPENDENCIES: "qt=5.* pyqt=5.*"
-    # PySide2
-#    - PYTHON_VERSION: "3.5"
-#      CONDA_DEPENDENCIES: "qt=5.* pyside2"
-#    - PYTHON_VERSION: "3.4"
-#      CONDA_DEPENDENCIES: "qt=5.* pyside2"
-#    - PYTHON_VERSION: "2.7"
-#      CONDA_DEPENDENCIES: "qt=5.* pyside2"
     # PyQt4
     - PYTHON_VERSION: "3.5"
       CONDA_DEPENDENCIES: "qt=4.* pyqt=4.*"
@@ -44,6 +37,15 @@ platform:
     -x64
 
 install:
+    # If there is a newer build queued for the same PR, cancel this one.
+    # The AppVeyor 'rollout builds' option is supposed to serve the same
+    # purpose but it is problematic because it tends to cancel builds pushed
+    # directly to master instead of just PR builds (or the converse).
+    # credits: JuliaLang developers.
+    - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
+        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." }
     - "git clone git://github.com/astropy/ci-helpers.git"
     - "powershell ci-helpers/appveyor/install-miniconda.ps1"
     - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
@@ -55,5 +57,4 @@ install:
 build: false
 
 test_script:
-  - "ciocheck qtawesome"
   - "%CMD_IN_ENV% python example.py"

circle.yml

@@ -9,7 +9,6 @@ machine:
     # Environment variables used by astropy helpers
     TRAVIS_OS_NAME: "linux"
     CONDA_DEPENDENCIES: "qtpy"
-    PIP_DEPENDENCIES: "coveralls pytest-qt"
 
 dependencies:
   override:
@@ -21,23 +20,11 @@ dependencies:
       source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh &&
       export PATH="$HOME/miniconda/bin:$PATH" &&
       source activate test &&
-      conda install ciocheck -c conda-forge &&
+      conda install -q ciocheck -c spyder-ide &&
       python setup.py develop;
 
 test:
   override:
     # Check style
     - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && ciocheck qtawesome: # note the colon
         parallel: true
-    # Check PyQt5
-    - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && conda install qt=5.* pyqt=5.* && python example.py: # note the colon
-        parallel: true
-    # Check PySide2
-#    - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && conda install qt=5.* pyside2 && python example.py: # note the colon
-#        parallel: true
-    # Check PyQt4
-    - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && conda install qt=4.* pyqt=4.* && python example.py: # note the colon
-        parallel: true
-    # Check Pyside
-    - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then export PATH="$HOME/miniconda/bin:$PATH" && source activate test && conda install qt=4.* pyside && && python example.py; fi: # note the colon
-        parallel: true