diff --git a/appveyor.yml b/appveyor.yml index 133565951b6..d9f05f62391 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,6 +7,11 @@ environment: PYTHON_ARCH: "64" USE_QT_API: "PyQt5" + - PYTHON: "C:\\Python27_64" + PYTHON_VERSION: "2.7" + PYTHON_ARCH: "64" + USE_QT_API: "PyQt5" + - PYTHON: "C:\\Python35_64" PYTHON_VERSION: "3.5" PYTHON_ARCH: "64" diff --git a/continuous_integration/appveyor/build_test.bat b/continuous_integration/appveyor/build_test.bat index dafebf273d1..86dff2910c6 100644 --- a/continuous_integration/appveyor/build_test.bat +++ b/continuous_integration/appveyor/build_test.bat @@ -5,10 +5,6 @@ python setup.py sdist if errorlevel 1 exit 1 cd %APPVEYOR_BUILD_FOLDER%\continuous_integration\conda-recipes -if %USE_QT_API%==PyQt5 ( - conda build -q qtconsole - if errorlevel 1 exit 1 -) conda build -q spyder if errorlevel 1 exit 1 diff --git a/continuous_integration/appveyor/install.ps1 b/continuous_integration/appveyor/install.ps1 index 0cb274d5ab4..f5f3b40a1c9 100644 --- a/continuous_integration/appveyor/install.ps1 +++ b/continuous_integration/appveyor/install.ps1 @@ -84,11 +84,11 @@ function UpdateConda ($python_home) { Write-Host "Updating conda..." $args = "update --yes conda" $spy_channel_args = "config --add channels spyder-ide" - $mlabs_channel_args = "config --add channels m-labs" + $qttesting_channel_args = "config --add channels qttesting" Write-Host $conda_path $args Start-Process -FilePath "$conda_path" -ArgumentList $args -Wait -Passthru Start-Process -FilePath "$conda_path" -ArgumentList $spy_channel_args -Wait -Passthru - Start-Process -FilePath "$conda_path" -ArgumentList $mlabs_channel_args -Wait -Passthru + Start-Process -FilePath "$conda_path" -ArgumentList $qttesting_channel_args -Wait -Passthru } diff --git a/continuous_integration/appveyor/modules_test.bat b/continuous_integration/appveyor/modules_test.bat index 8885d47b66b..639468bc1dd 100644 --- a/continuous_integration/appveyor/modules_test.bat +++ b/continuous_integration/appveyor/modules_test.bat @@ -80,39 +80,6 @@ for /r "%SPYDERLIB%" %%f in (*.py) do ( python "%%f" || exit 1 echo. ) - ) else if "%%f"=="%SPYDERLIB%\widgets\browser.py" ( - :: Not testing this file for now because m-labs builds doesn't have - :: web widgets - if %USE_QT_API%==PyQt5 ( - echo --- NOT testing %%f --- - echo. - ) else ( - echo --- Testing %%f --- - python "%%f" || exit 1 - echo. - ) - ) else if "%%f"=="%SPYDERLIB%\widgets\ipython.py" ( - :: Not testing this file for now because m-labs builds doesn't have - :: web widgets - if %USE_QT_API%==PyQt5 ( - echo --- NOT testing %%f --- - echo. - ) else ( - echo --- Testing %%f --- - python "%%f" || exit 1 - echo. - ) - ) else if "%%f"=="%SPYDERLIB%\widgets\pydocgui.py" ( - :: Not testing this file for now because m-labs builds doesn't have - :: web widgets - if %USE_QT_API%==PyQt5 ( - echo --- NOT testing %%f --- - echo. - ) else ( - echo --- Testing %%f --- - python "%%f" || exit 1 - echo. - ) ) else ( echo --- Testing %%f --- python "%%f" || exit 1 @@ -120,10 +87,27 @@ for /r "%SPYDERLIB%" %%f in (*.py) do ( ) ) -:: Spyplugins -for /r "%APPVEYOR_BUILD_FOLDER%\spyplugins" %%f in (*.py) do ( +:: Third-party plugins +for /r "%APPVEYOR_BUILD_FOLDER%\spyder_breakpoints" %%f in (*.py) do ( + set file=%%f + if not "!file:widgets\=!"=="!file!" ( + echo --- Testing %%f --- + python "%%f" || exit 1 + echo. + ) +) + +for /r "%APPVEYOR_BUILD_FOLDER%\spyder_profiler" %%f in (*.py) do ( set file=%%f + if not "!file:widgets\=!"=="!file!" ( + echo --- Testing %%f --- + python "%%f" || exit 1 + echo. + ) +) +for /r "%APPVEYOR_BUILD_FOLDER%\spyder_pylint" %%f in (*.py) do ( + set file=%%f if not "!file:widgets\=!"=="!file!" ( echo --- Testing %%f --- python "%%f" || exit 1 diff --git a/continuous_integration/conda-recipes/spyder/meta.yaml b/continuous_integration/conda-recipes/spyder/meta.yaml index 10e34baf0ca..1320e81c14b 100644 --- a/continuous_integration/conda-recipes/spyder/meta.yaml +++ b/continuous_integration/conda-recipes/spyder/meta.yaml @@ -21,7 +21,9 @@ requirements: run: - python - python.app # [osx] - - {% if environ.get('USE_QT_API') == 'PyQt4' %} pyqt {% else %} pyqt5 {% endif %} + - {% if environ.get('USE_QT_API') == 'PyQt4' %} pyqt {% else %} pyqt5 {% endif %} # [unix] + - {% if environ.get('USE_QT_API') == 'PyQt4' %} qt 4.* {% else %} qt 5.* {% endif %} # [win] + - {% if environ.get('USE_QT_API') == 'PyQt4' %} pyqt 4.* {% else %} pyqt 5.* {% endif %} # [win] - rope 0.9.* # [py34 or py35] - rope # [py27] - pyflakes