Add fixes (read: ugly workaround) for the WDK issue on AppVeyor and restile the markup a bit (single quotes).

ionelmc · ionelmc · commit ca5e65c35db8 · 2015-09-17T00:21:41.000+03:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,120 +2,126 @@ version: '{branch}-{build}'
 build: off
 environment:
   global:
-    WITH_COMPILER: "cmd /E:ON /V:ON /C .\\ci\\appveyor-with-compiler.cmd"
+    WITH_COMPILER: 'cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd'
   matrix:
     - TOXENV: check
-      PYTHON_HOME: "C:\\Python27"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
-    - TOXENV: "2.7,codecov"
-      TOXPYTHON: "C:\\Python27\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.0"
-      PYTHON_HOME: "C:\\Python27"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
-    - TOXENV: "2.7,codecov"
-      TOXPYTHON: "C:\\Python27-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.0"
-      PYTHON_HOME: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-    - TOXENV: "2.7-nocover"
-      TOXPYTHON: "C:\\Python27\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.0"
-      PYTHON_HOME: "C:\\Python27"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
-    - TOXENV: "2.7-nocover"
-      TOXPYTHON: "C:\\Python27-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.0"
-      PYTHON_HOME: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-    - TOXENV: "3.3,codecov"
-      TOXPYTHON: "C:\\Python33\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python33"
-      PYTHON_VERSION: "3.3"
-      PYTHON_ARCH: "32"
-    - TOXENV: "3.3,codecov"
-      TOXPYTHON: "C:\\Python33-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python33-x64"
-      PYTHON_VERSION: "3.3"
-      PYTHON_ARCH: "64"
-    - TOXENV: "3.3-nocover"
-      TOXPYTHON: "C:\\Python33\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python33"
-      PYTHON_VERSION: "3.3"
-      PYTHON_ARCH: "32"
-    - TOXENV: "3.3-nocover"
-      TOXPYTHON: "C:\\Python33-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python33-x64"
-      PYTHON_VERSION: "3.3"
-      PYTHON_ARCH: "64"
-    - TOXENV: "3.4,codecov"
-      TOXPYTHON: "C:\\Python34\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python34"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "32"
-    - TOXENV: "3.4,codecov"
-      TOXPYTHON: "C:\\Python34-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "64"
-    - TOXENV: "3.4-nocover"
-      TOXPYTHON: "C:\\Python34\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python34"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "32"
-    - TOXENV: "3.4-nocover"
-      TOXPYTHON: "C:\\Python34-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "64"
-    - TOXENV: "3.5,codecov"
-      TOXPYTHON: "C:\\Python35\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python35"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
-    - TOXENV: "3.5,codecov"
-      TOXPYTHON: "C:\\Python35-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
-    - TOXENV: "3.5-nocover"
-      TOXPYTHON: "C:\\Python35\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python35"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
-    - TOXENV: "3.5-nocover"
-      TOXPYTHON: "C:\\Python35-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.1"
-      PYTHON_HOME: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
+      PYTHON_HOME: 'C:\Python27'
+      PYTHON_VERSION: '2.7'
+      PYTHON_ARCH: '32'
+    - TOXENV: '2.7,codecov'
+      TOXPYTHON: 'C:\Python27\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.0'
+      PYTHON_HOME: 'C:\Python27'
+      PYTHON_VERSION: '2.7'
+      PYTHON_ARCH: '32'
+    - TOXENV: '2.7,codecov'
+      TOXPYTHON: 'C:\Python27-x64\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.0'
+      PYTHON_HOME: 'C:\Python27-x64'
+      PYTHON_VERSION: '2.7'
+      PYTHON_ARCH: '64'
+    - TOXENV: '2.7-nocover'
+      TOXPYTHON: 'C:\Python27\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.0'
+      PYTHON_HOME: 'C:\Python27'
+      PYTHON_VERSION: '2.7'
+      PYTHON_ARCH: '32'
+    - TOXENV: '2.7-nocover'
+      TOXPYTHON: 'C:\Python27-x64\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.0'
+      PYTHON_HOME: 'C:\Python27-x64'
+      PYTHON_VERSION: '2.7'
+      PYTHON_ARCH: '64'
+    - TOXENV: '3.3,codecov'
+      TOXPYTHON: 'C:\Python33\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.1'
+      PYTHON_HOME: 'C:\Python33'
+      PYTHON_VERSION: '3.3'
+      PYTHON_ARCH: '32'
+    - TOXENV: '3.3,codecov'
+      TOXPYTHON: 'C:\Python33-x64\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.1'
+      PYTHON_HOME: 'C:\Python33-x64'
+      PYTHON_VERSION: '3.3'
+      PYTHON_ARCH: '64'
+    - TOXENV: '3.3-nocover'
+      TOXPYTHON: 'C:\Python33\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.1'
+      PYTHON_HOME: 'C:\Python33'
+      PYTHON_VERSION: '3.3'
+      PYTHON_ARCH: '32'
+    - TOXENV: '3.3-nocover'
+      TOXPYTHON: 'C:\Python33-x64\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.1'
+      PYTHON_HOME: 'C:\Python33-x64'
+      PYTHON_VERSION: '3.3'
+      PYTHON_ARCH: '64'
+    - TOXENV: '3.4,codecov'
+      TOXPYTHON: 'C:\Python34\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.1'
+      PYTHON_HOME: 'C:\Python34'
+      PYTHON_VERSION: '3.4'
+      PYTHON_ARCH: '32'
+    - TOXENV: '3.4,codecov'
+      TOXPYTHON: 'C:\Python34-x64\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.1'
+      PYTHON_HOME: 'C:\Python34-x64'
+      PYTHON_VERSION: '3.4'
+      PYTHON_ARCH: '64'
+    - TOXENV: '3.4-nocover'
+      TOXPYTHON: 'C:\Python34\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.1'
+      PYTHON_HOME: 'C:\Python34'
+      PYTHON_VERSION: '3.4'
+      PYTHON_ARCH: '32'
+    - TOXENV: '3.4-nocover'
+      TOXPYTHON: 'C:\Python34-x64\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.1'
+      PYTHON_HOME: 'C:\Python34-x64'
+      PYTHON_VERSION: '3.4'
+      PYTHON_ARCH: '64'
+    - TOXENV: '3.5,codecov'
+      TOXPYTHON: 'C:\Python35\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.1'
+      PYTHON_HOME: 'C:\Python35'
+      PYTHON_VERSION: '3.5'
+      PYTHON_ARCH: '32'
+    - TOXENV: '3.5,codecov'
+      TOXPYTHON: 'C:\Python35-x64\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.1'
+      PYTHON_HOME: 'C:\Python35-x64'
+      PYTHON_VERSION: '3.5'
+      PYTHON_ARCH: '64'
+    - TOXENV: '3.5-nocover'
+      TOXPYTHON: 'C:\Python35\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.1'
+      PYTHON_HOME: 'C:\Python35'
+      PYTHON_VERSION: '3.5'
+      PYTHON_ARCH: '32'
+    - TOXENV: '3.5-nocover'
+      TOXPYTHON: 'C:\Python35-x64\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.1'
+      PYTHON_HOME: 'C:\Python35-x64'
+      PYTHON_VERSION: '3.5'
+      PYTHON_ARCH: '64'
 init:
-  - "ECHO %TOXENV%"
-  - ps: "ls C:\\Python*"
+  - ps: 'echo $env:TOXENV'
+  - ps: 'ls C:\Python*'
 install:
-  - "python -u ci\\appveyor-bootstrap.py"
+  - python -u ci\appveyor-bootstrap.py
+  - '%PYTHON_HOME%\Scripts\virtualenv --version'
+  - '%PYTHON_HOME%\Scripts\easy_install --version'
+  - '%PYTHON_HOME%\Scripts\pip --version'
+  - '%PYTHON_HOME%\Scripts\tox --version'
 test_script:
-  - "%PYTHON_HOME%\\Scripts\\tox --version"
-  - "%PYTHON_HOME%\\Scripts\\virtualenv --version"
-  - "%PYTHON_HOME%\\Scripts\\pip --version"
-  - "%WITH_COMPILER% %PYTHON_HOME%\\Scripts\\tox"
+  - '%WITH_COMPILER% %PYTHON_HOME%\Scripts\tox'
 after_test:
-  - "IF \"%TOXENV:~-8,8%\" == \"-nocover\" %WITH_COMPILER% %TOXPYTHON% setup.py bdist_wheel"
+  - 'IF "%TOXENV:~-8,8%" == "-nocover" %WITH_COMPILER% %TOXPYTHON% setup.py bdist_wheel'
 artifacts:
-  - path: dist\*
+  - path: 'dist\*'
+on_failure:
+  - ps: 'dir env:'
+  - ps: 'get-content .tox\*\log\*'
+### To enable remote debugging uncomment this:
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
diff --git a/ci/appveyor-with-compiler.cmd b/ci/appveyor-with-compiler.cmd
@@ -19,18 +19,28 @@
 :: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
 SET COMMAND_TO_RUN=%*
 SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
+SET WIN_WDK="c:\Program Files (x86)\Windows Kits\10\Include\wdf"
 ECHO SDK: %WINDOWS_SDK_VERSION% ARCH: %PYTHON_ARCH%
 
-IF "%PYTHON_VERSION%"=="3.5" GOTO main
 
-IF "%PYTHON_ARCH%"=="32" GOTO main
+IF "%PYTHON_VERSION%"=="3.5" (
+    IF EXIST %WIN_WDK% (
+        REM See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/
+        REN %WIN_WDK% 0wdf
+    )
+    GOTO main
+)
+
+IF "%PYTHON_ARCH%"=="32" (
+    GOTO main
+)
 
 SET DISTUTILS_USE_SDK=1
 SET MSSdk=1
 "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
-call "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
+CALL "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
 
 :main
 
 ECHO Executing: %COMMAND_TO_RUN%
-call %COMMAND_TO_RUN% || EXIT 1
+CALL %COMMAND_TO_RUN% || EXIT 1
diff --git a/ci/templates/appveyor.yml b/ci/templates/appveyor.yml
@@ -2,38 +2,44 @@ version: '{branch}-{build}'
 build: off
 environment:
   global:
-    WITH_COMPILER: "cmd /E:ON /V:ON /C .\\ci\\appveyor-with-compiler.cmd"
+    WITH_COMPILER: 'cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd'
   matrix:
     - TOXENV: check
-      PYTHON_HOME: "C:\\Python27"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
+      PYTHON_HOME: 'C:\Python27'
+      PYTHON_VERSION: '2.7'
+      PYTHON_ARCH: '32'
 {% for env, config in tox_environments|dictsort %}{% if env.startswith(('2.7', '3.3', '3.4', '3.5')) %}
-    - TOXENV: "{{ env }}{% if config.cover %},codecov{% endif %}"
-      TOXPYTHON: "C:\\Python{{ env[:3].replace('.', '') }}\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.{{ '1' if env[0] == '3' else '0' }}"
-      PYTHON_HOME: "C:\\Python{{ env[:3].replace('.', '') }}"
-      PYTHON_VERSION: "{{ env[:3] }}"
-      PYTHON_ARCH: "32"
-    - TOXENV: "{{ env }}{% if config.cover %},codecov{% endif %}"
-      TOXPYTHON: "C:\\Python{{ env[:3].replace('.', '') }}-x64\\python.exe"
-      WINDOWS_SDK_VERSION: "v7.{{ '1' if env[0] == '3' else '0' }}"
-      PYTHON_HOME: "C:\\Python{{ env[:3].replace('.', '') }}-x64"
-      PYTHON_VERSION: "{{ env[:3] }}"
-      PYTHON_ARCH: "64"
+    - TOXENV: '{{ env }}{% if config.cover %},codecov{% endif %}'
+      TOXPYTHON: 'C:\Python{{ env[:3].replace('.', '') }}\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.{{ '1' if env[0] == '3' else '0' }}'
+      PYTHON_HOME: 'C:\Python{{ env[:3].replace('.', '') }}'
+      PYTHON_VERSION: '{{ env[:3] }}'
+      PYTHON_ARCH: '32'
+    - TOXENV: '{{ env }}{% if config.cover %},codecov{% endif %}'
+      TOXPYTHON: 'C:\Python{{ env[:3].replace('.', '') }}-x64\python.exe'
+      WINDOWS_SDK_VERSION: 'v7.{{ '1' if env[0] == '3' else '0' }}'
+      PYTHON_HOME: 'C:\Python{{ env[:3].replace('.', '') }}-x64'
+      PYTHON_VERSION: '{{ env[:3] }}'
+      PYTHON_ARCH: '64'
 {% endif %}{% endfor %}
 init:
-  - "ECHO %TOXENV%"
-  - ps: "ls C:\\Python*"
+  - ps: 'echo $env:TOXENV'
+  - ps: 'ls C:\Python*'
 install:
-  - "python -u ci\\appveyor-bootstrap.py"
+  - python -u ci\appveyor-bootstrap.py
+  - '%PYTHON_HOME%\Scripts\virtualenv --version'
+  - '%PYTHON_HOME%\Scripts\easy_install --version'
+  - '%PYTHON_HOME%\Scripts\pip --version'
+  - '%PYTHON_HOME%\Scripts\tox --version'
 test_script:
-  - "%PYTHON_HOME%\\Scripts\\tox --version"
-  - "%PYTHON_HOME%\\Scripts\\virtualenv --version"
-  - "%PYTHON_HOME%\\Scripts\\pip --version"
-  - "%WITH_COMPILER% %PYTHON_HOME%\\Scripts\\tox"
+  - '%WITH_COMPILER% %PYTHON_HOME%\Scripts\tox'
 after_test:
-  - "IF \"%TOXENV:~-8,8%\" == \"-nocover\" %WITH_COMPILER% %TOXPYTHON% setup.py bdist_wheel"
+  - 'IF "%TOXENV:~-8,8%" == "-nocover" %WITH_COMPILER% %TOXPYTHON% setup.py bdist_wheel'
 artifacts:
-  - path: dist\*
+  - path: 'dist\*'
+on_failure:
+  - ps: 'dir env:'
+  - ps: 'get-content .tox\*\log\*'
+### To enable remote debugging uncomment this:
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
