Merge pull request #3370 from ccordoba12/improve-cis

Some improvements to our CI services
spyder-ide · Aug 23, 2016 · 898acc1 · 898acc1
2 parents 127c5a1 + 990e1d9
commit 898acc1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,11 +12,8 @@ env:
 matrix:
   include:
     # Linux using pip packages
-    - python: "2.7"
-      env: USE_QT_API=PyQt4 USE_CONDA=false
-      os: linux
-    - python: "3.4"
-      env: USE_QT_API=PyQt4 USE_CONDA=false
+    - python: "3.5"
+      env: USE_QT_API=PyQt5 USE_CONDA=false
       os: linux
     # Linux using conda packages
     - python: "2.7"

diff --git a/continuous_integration/appveyor/build_test.bat b/continuous_integration/appveyor/build_test.bat
@@ -1,9 +1,5 @@
 conda info
 
-cd %APPVEYOR_BUILD_FOLDER%
-python setup.py sdist
-if errorlevel 1 exit 1
-
 cd %APPVEYOR_BUILD_FOLDER%\continuous_integration\conda-recipes
 
 conda build -q spyder

diff --git a/continuous_integration/appveyor/install.ps1 b/continuous_integration/appveyor/install.ps1
@@ -95,7 +95,7 @@ function UpdateConda ($python_home) {
 function main () {
     InstallMiniconda $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON
     UpdateConda $env:PYTHON
-    InstallCondaPackages $env:PYTHON "conda-build==1.21.0 pytest pytest-cov pytest-qt mock"
+    InstallCondaPackages $env:PYTHON "conda-build==1.21.9 pytest pytest-cov pytest-qt mock"
 }
 
 

diff --git a/continuous_integration/conda-recipes/spyder/meta.yaml b/continuous_integration/conda-recipes/spyder/meta.yaml
@@ -1,18 +1,15 @@
 package:
   name: spyder
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '').replace('v', '') }}  # [unix]
-  version: 3.99.0  # [win]
+  version: {{ GIT_DESCRIBE_TAG|replace('v', '') }}  # [unix]
+  version: 99.99.0  # [win]
 
 build:
-  number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}  # [unix]
+  number: {{ GIT_DESCRIBE_NUMBER|int }}  # [unix]
   number: 0  # [win]
-  osx_is_app: True
 
 source:
-  fn:  spyder-3.0.0.dev0.zip  # [win]
-  url: {{ ['file:///', environ.get('APPVEYOR_BUILD_FOLDER'), '\dist\spyder-3.0.0.dev0.zip']|join }}  # [win]
-  git_url: {{ environ.get('FULL_SPYDER_CLONE') }}  # [unix]
-  git_tag: {% if environ.get('TRAVIS_PULL_REQUEST') != 'false' %} {{ ['travis_pr_', environ.get('TRAVIS_PULL_REQUEST')]|join }} {% else %} master {% endif %}  # [unix]
+  git_url: {{ APPVEYOR_BUILD_FOLDER }}  # [win]
+  git_url: {{ FULL_SPYDER_CLONE }}  # [unix]
 
 requirements:
   build:

diff --git a/continuous_integration/travis/install.sh b/continuous_integration/travis/install.sh
@@ -3,7 +3,6 @@
 set -ex
 
 PY_VERSION=$TRAVIS_PYTHON_VERSION
-WHEELHOUSE_URI=travis-wheels.scikit-image.org
 
 #==============================================================================
 # Utility functions
@@ -56,7 +55,7 @@ install_conda()
         if [ "$USE_QT_API" = "PyQt5" ]; then
             conda config --add channels qttesting;
         fi
-        echo 'conda-build ==1.18.1' > $HOME/miniconda/conda-meta/pinned;
+        #echo 'conda-build ==1.18.1' > $HOME/miniconda/conda-meta/pinned;
         conda install conda-build;
         conda create -q -n test-environment python=$PY_VERSION;
         conda install -q -y -n test-environment pytest pytest-cov pytest-qt mock
@@ -66,19 +65,15 @@ install_conda()
 
 install_pip()
 {
-    # Install PyQt
-    if [ "$USE_QT_API" = "PyQt5" ]; then
-        conda install pyqt=5.* qt=5.* -c  qttesting;
-    elif [ "$USE_QT_API" = "PyQt4" ]; then
-        conda install pyqt=4.* qt=4.*;
-    fi
+    # Install PyQt5
+    conda install -c qttesting pyqt;
 
     # Install testing packages
     pip install pytest pytest-cov pytest-qt mock
 
     # Install extra packages
     EXTRA_PACKAGES="matplotlib pandas sympy pyzmq pillow"
-    pip install --no-index --trusted-host $WHEELHOUSE_URI --find-links=http://$WHEELHOUSE_URI/ $EXTRA_PACKAGES
+    pip install $EXTRA_PACKAGES
 }