ci: move vs2017 jobs from appveyor to azure

and clean things up a bit

.appveyor.yml

@@ -6,20 +6,9 @@ environment:
     - MSVC_PLATFORM: x86
       PYTHON_ROOT: Python34
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    - MSVC_PLATFORM: x86
-      PYTHON_ROOT: Python35
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    - MSVC_PLATFORM: x64
-      PYTHON_ROOT: Python35-x64
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    - MSVC_PLATFORM: x86
-      PYTHON_ROOT: Python36
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    - MSVC_PLATFORM: x64
-      PYTHON_ROOT: Python36-x64
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 
 build_script:
+  - set PYTHON=C:\%PYTHON_ROOT%\python.exe
   - .appveyor/msvc.bat
 
 deploy: off

.appveyor/msvc.bat

@@ -3,14 +3,13 @@ appveyor DownloadFile https://github.com/preshing/cairo-windows/releases/downloa
 7z x cairo-windows-%CAIRO_VER%.zip
 
 ::~ set MSVC_PLATFORM=x86
-::~ set PYTHON_ROOT=Python27
+::~ set PYTHON=C:\Python27\python.exe
 ::~ set PATH=
 ::~ set LIBPATH=
 
 set CAIRO_ROOT=%CD%\cairo-windows-%CAIRO_VER%
 set INCLUDE=%CAIRO_ROOT%\include
 set LIB=%CAIRO_ROOT%\lib\%MSVC_PLATFORM%
-set PYTHON=C:\%PYTHON_ROOT%\python.exe
 
 ::~ call "%LOCALAPPDATA%\Programs\Common\Microsoft\Visual C++ for Python\9.0\vcvarsall.bat" %MSVC_PLATFORM%
 ::~ SET DISTUTILS_USE_SDK=1

.azure-pipelines/msvc.bat

@@ -0,0 +1,28 @@
+set CAIRO_VER=1.15.10
+wget https://github.com/preshing/cairo-windows/releases/download/%CAIRO_VER%/cairo-windows-%CAIRO_VER%.zip
+7z x cairo-windows-%CAIRO_VER%.zip
+
+::~ set MSVC_PLATFORM=x86
+::~ set PYTHON=C:\Python27\python.exe
+::~ set PATH=
+::~ set LIBPATH=
+
+set CAIRO_ROOT=%CD%\cairo-windows-%CAIRO_VER%
+set INCLUDE=%CAIRO_ROOT%\include
+set LIB=%CAIRO_ROOT%\lib\%MSVC_PLATFORM%
+
+::~ call "%LOCALAPPDATA%\Programs\Common\Microsoft\Visual C++ for Python\9.0\vcvarsall.bat" %MSVC_PLATFORM%
+::~ SET DISTUTILS_USE_SDK=1
+::~ SET MSSdk=1
+
+%PYTHON% -m pip install --upgrade setuptools || goto :error
+%PYTHON% -m pip install --upgrade pytest hypothesis coverage codecov || goto :error
+copy cairo-windows-%CAIRO_VER%\lib\%MSVC_PLATFORM%\cairo.dll cairo || goto :error
+set CL=/WX
+%PYTHON% -m coverage run --branch setup.py test || goto :error
+%PYTHON% -m coverage xml || goto :error
+%PYTHON% -m codecov --required -f coverage.xml
+
+goto :EOF
+:error
+exit /b 1

azure-pipelines.yml

@@ -2,9 +2,8 @@ jobs:
   - job: MSYS2
     timeoutInMinutes: 60
     pool:
-      vmImage: vs2015-win2012r2
+      vmImage: vs2017-win2016
     strategy:
-      maxParallel: 4
       matrix:
         py2-i686:
           MSYSTEM: MINGW32
@@ -24,11 +23,12 @@ jobs:
           PYTHON: python3
     steps:
       - script: |
-          git clone https://github.com/lazka/msys2-ci-base.git %CD:~0,2%\msys64
+          choco install msys2 --params="/InstallDir:%CD:~0,2%\msys64 /NoUpdate /NoPath"
         displayName: Install MSYS2
       - script: |
           set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
           %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu
+          %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syuu
         displayName: Update MSYS2
       - script: |
           set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
@@ -36,8 +36,46 @@ jobs:
         displayName: Test
         env:
           CHERE_INVOKING: yes
-          MSYSTEM: $(MSYSTEM)
-          MSYS2_ARCH: $(MSYS2_ARCH)
-          PYTHON: $(PYTHON)
           CODECOV_TOKEN: $(CODECOV_TOKEN)
           CODECOV_BRANCH: $(Build.SourceBranchName)
+
+  - job: MSVC
+    timeoutInMinutes: 60
+    pool:
+      vmImage: vs2017-win2016
+    strategy:
+      matrix:
+        Python37-x64:
+          python.version: '3.7'
+          python.arch: 'x64'
+        Python37-x86:
+          python.version: '3.7'
+          python.arch: 'x86'
+        Python36-x64:
+          python.version: '3.6'
+          python.arch: 'x64'
+        Python36-x86:
+          python.version: '3.6'
+          python.arch: 'x86'
+        Python35-x64:
+          python.version: '3.5'
+          python.arch: 'x64'
+        Python35-x86:
+          python.version: '3.5'
+          python.arch: 'x86'
+    steps:
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: '$(python.version)'
+          architecture: '$(python.arch)'
+      - script: |
+          choco install 7zip wget
+        displayName: Install Dependencies
+      - script: |
+          call .azure-pipelines\msvc.bat
+        displayName: Build & Test
+        env:
+          MSVC_PLATFORM: $(python.arch)
+          CODECOV_TOKEN: $(CODECOV_TOKEN)
+          CODECOV_BRANCH: $(Build.SourceBranchName)
+          PYTHON: python