Merge remote-tracking branch 'upstream/master' into gha-msys

# Conflicts:
#	.appveyor.yml
#	.github/workflows/test-windows.yml

Author: nulano

.appveyor.yml

@@ -1,51 +1,42 @@
 version: '{build}'
+image: Visual Studio 2017
 clone_folder: c:\pillow
 init:
 - ECHO %PYTHON%
 #- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 # Uncomment previous line to get RDP access during the build.
 
 environment:
-  X64_EXT: -x64
   EXECUTABLE: python.exe
   PIP_DIR: Scripts
-  VENV: NO
   TEST_OPTIONS:
   DEPLOY: YES
   matrix:
   - PYTHON: C:/Python38
-  - PYTHON: C:/Python38-x64
-  - PYTHON: C:/Python35
+    ARCHITECTURE: x86
   - PYTHON: C:/Python35-x64
-  - PYTHON: C:/vp/pypy3
-    EXECUTABLE: bin/pypy.exe
-    VENV: YES
+    ARCHITECTURE: x64
 
 
 install:
 - curl -fsSL -o pillow-depends.zip https://github.com/python-pillow/pillow-depends/archive/master.zip
 - 7z x pillow-depends.zip -oc:\
 - mv c:\pillow-depends-master c:\pillow-depends
-- xcopy c:\pillow-depends\*.zip c:\pillow\winbuild\
-- xcopy c:\pillow-depends\*.tar.gz c:\pillow\winbuild\
 - xcopy /s c:\pillow-depends\test_images\* c:\pillow\tests\images
+- 7z x ..\pillow-depends\nasm-2.14.02-win64.zip -oc:\
+- curl -fsSL -o gs952.exe https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/gs952w32.exe
+- gs952.exe /S
+- path c:\nasm-2.14.02;C:\Program Files (x86)\gs\gs9.52\bin;%PATH%
 - cd c:\pillow\winbuild\
 - ps: |
-      if ($env:PYTHON -eq "c:/vp/pypy3")
-      {
-        c:\pillow\winbuild\appveyor_install_pypy3.cmd
-      }
-- ps: |
-        c:\python37\python.exe c:\pillow\winbuild\build_dep.py
-        c:\pillow\winbuild\build_deps.cmd
+        c:\python37\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\
+        c:\pillow\winbuild\build\build_dep_all.cmd
         $host.SetShouldExit(0)
-- curl -fsSL -o gs952.exe https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/gs952w32.exe
-- gs952.exe /S
-- path %path%;C:\Program Files (x86)\gs\gs9.52\bin
+- path C:\pillow\winbuild\build\bin;%PATH%
 
 build_script:
 - ps: |
-        & $env:PYTHON/$env:EXECUTABLE c:\pillow\winbuild\build.py
+        c:\pillow\winbuild\build\build_pillow.cmd install
         $host.SetShouldExit(0)
 - cd c:\pillow
 - '%PYTHON%\%EXECUTABLE% selftest.py --installed'
@@ -77,7 +68,7 @@ before_deploy:
   - cd c:\pillow
   - '%PYTHON%\%PIP_DIR%\pip.exe install wheel'
   - cd c:\pillow\winbuild\
-  - '%PYTHON%\%EXECUTABLE% c:\pillow\winbuild\build.py --wheel'
+  - c:\pillow\winbuild\build\build_pillow.cmd bdist_wheel
   - cd c:\pillow
   - ps: Get-ChildItem .\dist\*.* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
 

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
     name: Python ${{ matrix.python-version }}
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     - name: pip cache
       uses: actions/cache@v1

.github/workflows/test-docker.yml

@@ -30,7 +30,7 @@ jobs:
     name: ${{ matrix.docker }}
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     - name: Build system information
       run: python .github/workflows/system-info.py