diff --git a/.appveyor.yml b/.appveyor.yml index bb1e91d0c..645c2256f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,5 @@ version: '{build}' +image: Visual Studio 2017 clone_folder: c:\pillow init: - ECHO %PYTHON% @@ -35,6 +36,8 @@ install: - xcopy c:\pillow-depends\*.zip c:\pillow\winbuild\depends\ - xcopy c:\pillow-depends\*.tar.gz c:\pillow\winbuild\depends\ - xcopy /s c:\pillow-depends\test_images\* c:\pillow\tests\images +- 7z x ..\pillow-depends\nasm-2.14.02-win64.zip -oc:\ +- path c:\nasm-2.14.02;%PATH% - cd c:\pillow\winbuild\ - ps: | if ($env:PYTHON -eq "c:/vp/pypy3") @@ -67,7 +70,7 @@ build_script: } else { - & $env:PYTHON/$env:EXECUTABLE c:\pillow\winbuild\build\build_pillow.cmd install + c:\pillow\winbuild\build\build_pillow.cmd install $host.SetShouldExit(0) } - cd c:\pillow @@ -100,7 +103,7 @@ before_deploy: - cd c:\pillow - '%PYTHON%\%PIP_DIR%\pip.exe install wheel' - cd c:\pillow\winbuild\ - - '%PYTHON%\%EXECUTABLE% c:\pillow\winbuild\build\build_pillow.cmd bdist_wheel' + - c:\pillow\winbuild\build\build_pillow.cmd bdist_wheel - cd c:\pillow - ps: Get-ChildItem .\dist\*.* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } diff --git a/Tests/test_imageshow.py b/Tests/test_imageshow.py index 0d513a47d..c8c247dc2 100644 --- a/Tests/test_imageshow.py +++ b/Tests/test_imageshow.py @@ -38,8 +38,7 @@ def test_viewer_show(): @pytest.mark.skipif( - not on_ci() or (is_win32() and on_github_actions()), - reason="Only run on CIs; hangs on Windows on GitHub Actions", + not on_ci() or is_win32(), reason="Only run on CIs; hangs on Windows 10", ) def test_show(): for mode in ("1", "I;16", "LA", "RGB", "RGBA"):