Fix missing channels and dependencies

goanpeca · goanpeca · commit 25ce82ed4c34 · 2016-08-02T18:40:26.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,14 +5,21 @@ language: c
 
 sudo: false
 
+branches:
+  only:
+    - master
+
 os:
   - linux
   - osx
 
 env:
   global:
     - SETUP_XVFB=True
-    - CONDA_DEPENDENCIES='pytest'
+    - CONDA_CHANNELS="spyder-ide qttesting"
+    - CONDA_DEPENDENCIES="pytest pytest-cov"
+    - PIP_DEPENDENCIES="coveralls"
+
   matrix:
     - PYTHON_VERSION=2.7 USE_QT_API=PyQt5
     - PYTHON_VERSION=2.7 USE_QT_API=PyQt4
@@ -24,12 +31,12 @@ env:
 before_install:
   # Test environments for different Qt bindings
   - if [[ "$USE_QT_API" == "PyQt5" ]]; then
-      export CONDA_DEPENDENCIES='qt5 pyqt5 '$CONDA_DEPENDENCIES;
+      export CONDA_DEPENDENCIES='qt=5.* pyqt=5.* '$CONDA_DEPENDENCIES;
       export CONDA_CHANNELS='spyder-ide';
     elif [[ "$USE_QT_API" == "PyQt4" ]]; then
-      export CONDA_DEPENDENCIES='qt pyqt '$CONDA_DEPENDENCIES;
+      export CONDA_DEPENDENCIES='qt=4.* pyqt=4.* '$CONDA_DEPENDENCIES;
     elif [[ "$USE_QT_API" == "PySide" ]]; then
-      export CONDA_DEPENDENCIES='qt pyside '$CONDA_DEPENDENCIES;
+      export CONDA_DEPENDENCIES='qt=4.* pyside '$CONDA_DEPENDENCIES;
     fi
 
 install:
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,26 +1,34 @@
-environment:
+# https://ci.appveyor.com/project/goanpeca/qtpy
+
+branches:
+  only:
+    - master
 
+environment:
   global:
       PYTHON: "C:\\conda"
       CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers\\appveyor\\windows_sdk.cmd"
       PYTHON_ARCH: "64" # needs to be set for CMD_IN_ENV to succeed. If a mix
                         # of 32 bit and 64 bit builds are needed, move this
                         # to the matrix section.
+      # Used by atropy ci-helpers
+      CONDA_CHANNELS: "spyder-ide qttesting"
 
   matrix:
-
-    # - PYTHON_VERSION: "2.7"
-    #   CONDA_CHANNELS: "msarahan"
-    #   CONDA_DEPENDENCIES: "pytest qt5 pyqt5"
+    # Qt4
+    - PYTHON_VERSION: "2.7"
+      CONDA_DEPENDENCIES: "pytest pytest-cov qt=4.* pyside"
     - PYTHON_VERSION: "2.7"
-      CONDA_DEPENDENCIES: "pytest qt pyqt"
+      CONDA_DEPENDENCIES: "pytest pytest-cov qt=4.* pyqt=4.*"
+    - PYTHON_VERSION: "3.4"
+      CONDA_DEPENDENCIES: "pytest pytest-cov qt=4.* pyqt=4.*"
+    - PYTHON_VERSION: "3.5"
+      CONDA_DEPENDENCIES: "pytest pytest-cov qt=4.* pyqt=4.*"
+    # Qt5
     - PYTHON_VERSION: "2.7"
-      CONDA_DEPENDENCIES: "pytest qt pyside"
-    # - PYTHON_VERSION: "3.5"
-    #   CONDA_CHANNELS: "msarahan"
-    #   CONDA_DEPENDENCIES: "pytest qt5 pyqt5"
+      CONDA_DEPENDENCIES: "pytest pytest-cov qt=5.* pyqt=5.*"
     - PYTHON_VERSION: "3.5"
-      CONDA_DEPENDENCIES: "pytest qt pyqt"
+      CONDA_DEPENDENCIES: "pytest pytest-cov qt=5.* pyqt=5.*"
 
 platform:
     -x64
@@ -30,6 +38,7 @@ install:
     - "powershell ci-helpers/appveyor/install-miniconda.ps1"
     - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
     - "activate test"
+    - "python setup.py install"
 
 # Not a .NET project, we build in the install step instead
 build: false
