Merge pull request #2800 from ccordoba12/fix-ci

Fix problems in AppVeyor and Travis
spyder-ide · Nov 5, 2015 · 8c87308 · 8c87308
2 parents 39daee7 + 6d9890b
commit 8c87308
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,9 +25,6 @@ matrix:
     - python: "2.7"
       env: USE_QT_API=PyQt5 USE_CONDA=true
       os: linux
-    - python: "3.4"
-      env: USE_QT_API=PyQt4 USE_CONDA=true
-      os: linux
     - python: "3.5"
       env: USE_QT_API=PyQt4 USE_CONDA=true
       os: linux

diff --git a/appveyor.yml b/appveyor.yml
@@ -7,14 +7,14 @@ environment:
     #  PYTHON_ARCH:    "64"
     #  USE_QT_API:     "PyQt4"
 
-    - PYTHON:         "C:\\Python34_64"
-      PYTHON_VERSION: "3.4"
+    - PYTHON:         "C:\\Python35_64"
+      PYTHON_VERSION: "3.5"
       PYTHON_ARCH:    "64"
       USE_QT_API:     "PyQt4"
 
 install:
   - powershell .\\continuous_integration\\appveyor\\install.ps1
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\Library\\bin;%PATH%"
 
 build: false
 

diff --git a/continuous_integration/appveyor/build_test.bat b/continuous_integration/appveyor/build_test.bat
@@ -1,3 +1,7 @@
-cd %APPVEYOR_BUILD_FOLDER%\\continuous_integration\\conda-recipes
+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
+if errorlevel 1 exit 1
diff --git a/continuous_integration/appveyor/install.ps1 b/continuous_integration/appveyor/install.ps1
@@ -7,7 +7,7 @@ $MINICONDA_URL = "http://repo.continuum.io/miniconda/"
 
 function DownloadMiniconda ($python_version, $platform_suffix) {
     $webclient = New-Object System.Net.WebClient
-    if ($python_version -match "3.4") {
+    if ($python_version -match "3.5") {
         $filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe"
     } else {
         $filename = "Miniconda-latest-Windows-" + $platform_suffix + ".exe"
@@ -91,7 +91,7 @@ function UpdateConda ($python_home) {
 function main () {
     InstallMiniconda $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON
     UpdateConda $env:PYTHON
-    InstallCondaPackages $env:PYTHON "conda-build jinja2"
+    InstallCondaPackages $env:PYTHON "conda-build"
 }
 
 

diff --git a/continuous_integration/appveyor/run_test.bat b/continuous_integration/appveyor/run_test.bat
@@ -15,6 +15,12 @@ cd C:\projects\tmp
 REM Install the package we created
 conda install -q -y --use-local spyder==3.0.0b1
 
+REM Install missing deps
+if %PYTHON_VERSION%==3.5 (
+    pip install jedi==0.8.1
+    pip install pylint
+)
+
 REM Install extra packages
 conda install -q -y %EXTRA_PACKAGES%
 

diff --git a/continuous_integration/conda-recipes/spyder/meta.yaml b/continuous_integration/conda-recipes/spyder/meta.yaml
@@ -1,15 +1,17 @@
 package:
   name: spyder
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '').replace('v', '') }}
+  version: {{ environ.get('GIT_DESCRIBE_TAG', '').replace('v', '') }}                                    [unix]
+  version: 3.0.0b1                                                                                       [win]
 
 build:
-  number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
+  number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}                                                    [unix]
+  number: 0                                                                                              [win]
   osx_is_app: True
 
 source:
-  git_url: {{ environ.get('APPVEYOR_BUILD_FOLDER') }}   [win]
-  git_tag: {{ environ.get('APPVEYOR_REPO_COMMIT') }}    [win]
-  git_url: {{ environ.get('FULL_SPYDER_CLONE') }}       [unix]
+  fn:  spyder-3.0.0dev.zip                                                                               [win]
+  url: {{ ['file:///', environ.get('APPVEYOR_BUILD_FOLDER'), '\dist\spyder-3.0.0dev.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]
 
 requirements:
@@ -28,9 +30,9 @@ requirements:
     - sphinx
     - pep8
     - psutil
-    - pylint
+    - pylint                 [not win]
     - six
-    - python.app      [osx]
+    - python.app             [osx]
 
 about:
   home: https://github.com/spyder-ide/spyder

diff --git a/continuous_integration/travis/install.sh b/continuous_integration/travis/install.sh
@@ -44,21 +44,16 @@ install_conda()
     hash -r;
     conda config --set always_yes yes --set changeps1 no;
 
-    # - Pinning conda to this version because installing from tarballs is not
-    #   pulling deps in 3.18.2 and that breaks all our tests!!
-    # - Also pinning conda-env because of a bug in 2.4.3
-    echo 'conda ==3.18.1' > $HOME/miniconda/conda-meta/pinned;
-    echo 'conda-env ==2.4.2' >> $HOME/miniconda/conda-meta/pinned;
+    # Update conda
     conda update -q conda;
 
-    # Installing conda-build and jinja2 to do build tests
+    # Installing conda-build to do build tests
     if [ "$USE_CONDA" = true ]; then
-        conda install jinja2;
         conda install conda-build;
         conda create -q -n test-environment python=$PY_VERSION;
     fi
 
-    # Test environments for different Qt bindings
+    # Add our own channel for PyQt5 tests
     if [ "$USE_QT_API" = "PyQt5" ]; then
         conda config --add channels spyder-ide;
     fi

diff --git a/continuous_integration/travis/run_test.sh b/continuous_integration/travis/run_test.sh
@@ -26,7 +26,7 @@ if [ "$USE_CONDA" = true ] ; then
     cd ~/tmp
 
     # Install and run the package
-    conda install ~/miniconda/conda-bld/linux-64/spyder-*.tar.bz2
+    conda install --use-local spyder==3.0.0b1
 
     # Install extra packages
     conda install -q $EXTRA_PACKAGES