Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: More fixes for Appveyor #3982

Merged
merged 1 commit into from
Jan 18, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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"

12 changes: 1 addition & 11 deletions continuous_integration/appveyor/install.ps1
Original file line number Diff line number Diff line change
@@ -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"
}

11 changes: 3 additions & 8 deletions continuous_integration/appveyor/modules_test.bat
Original file line number Diff line number Diff line change
@@ -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 ---
3 changes: 3 additions & 0 deletions continuous_integration/appveyor/run_test.bat
Original file line number Diff line number Diff line change
@@ -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