Merge pull request #3982 from ccordoba12/more-av-fixes

PR: More fixes for Appveyor

appveyor.yml

@@ -2,13 +2,13 @@
 
 environment:
   matrix:
-    - PYTHON:         "C:\\Python35_64"
-      PYTHON_VERSION: "3.5"
+    - PYTHON:         "C:\\Python27_64"
+      PYTHON_VERSION: "2.7"
       PYTHON_ARCH:    "64"
       USE_QT_API:     "PyQt5"
 
-    - PYTHON:         "C:\\Python27_64"
-      PYTHON_VERSION: "2.7"
+    - PYTHON:         "C:\\Python35_64"
+      PYTHON_VERSION: "3.5"
       PYTHON_ARCH:    "64"
       USE_QT_API:     "PyQt5"
 

continuous_integration/appveyor/install.ps1

@@ -87,19 +87,9 @@ function InstallPipPackages ($python_home, $spec) {
 }
 
 
-function UpdateConda ($python_home) {
-    $conda_path = $python_home + "\Scripts\conda.exe"
-    Write-Host "Updating conda..."
-    $args = "update --yes conda"
-    Write-Host $conda_path $args
-    Start-Process -FilePath "$conda_path" -ArgumentList $args -Wait -Passthru
-}
-
-
 function main () {
     InstallMiniconda $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON
-    UpdateConda $env:PYTHON
-    InstallCondaPackages $env:PYTHON "conda-build=2.1.0 pytest pytest-cov mock"
+    InstallCondaPackages $env:PYTHON "conda=4.2.* conda-build=2.0.0 pytest pytest-cov mock"
     InstallPipPackages $env:PYTHON "pytest-qt"
 }
 

continuous_integration/appveyor/modules_test.bat

@@ -51,21 +51,16 @@ for /r "%SPYDER%" %%f in (*.py) do (
     ) else if not "!file:utils\help=!"=="!file!" (
         echo --- NOT testing %%f ---
         echo.
+    ) else if not "!file:utils\introspection=!"=="!file!" (
+        echo --- NOT testing %%f ---
+        echo.
     ) else if "%%f"=="%SPYDER%\utils\bsdsocket.py" (
         echo --- NOT testing %%f ---
         echo.
     ) else if "%%f"=="%spyder%\utils\inputhooks.py" (
         :: It can't be tested outside of a Python console
         echo --- NOT testing %%f ---
         echo.
-    ) else if "%%f"=="%SPYDER%\utils\introspection\module_completion.py" (
-        :: This is failing randomly
-        echo --- NOT testing %%f ---
-        echo.
-    ) else if "%%f"=="%SPYDER%\utils\introspection\plugin_client.py" (
-        :: We have to investigate this failure!
-        echo --- NOT testing %%f ---
-        echo.
     ) else if "%%f"=="%SPYDER%\widgets\editor.py" (
         :: This is making AppVeyor to time out!
         echo --- NOT testing %%f ---

continuous_integration/appveyor/run_test.bat

@@ -8,6 +8,9 @@ set EXTRA_PACKAGES=pandas sympy pillow
 mkdir C:\projects\tmp
 cd C:\projects\tmp
 
+:: Don't auto-update conda
+conda config --set auto_update_conda False
+
 :: Install the package we created
 conda install -q -y --use-local spyder-dev