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

Test Spyder with Qt 5.6 in AppVeyor #3319

Merged
merged 4 commits into from
Jul 29, 2016
Merged
Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions continuous_integration/appveyor/build_test.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions continuous_integration/appveyor/install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
}


Expand Down
54 changes: 19 additions & 35 deletions continuous_integration/appveyor/modules_test.bat
Original file line number Diff line number Diff line change
Expand Up @@ -80,50 +80,34 @@ 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
echo.
)
)

:: 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
Expand Down
4 changes: 3 additions & 1 deletion continuous_integration/conda-recipes/spyder/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down