From 923f9600e8c2c6979b8d101f0407041e580e72c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= Date: Wed, 16 Sep 2015 21:39:15 +0300 Subject: [PATCH 1/6] Damn it --- appveyor.yml | 98 ++-------------------------------------------------- 1 file changed, 2 insertions(+), 96 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9cc2665..78e9054 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,103 +4,8 @@ environment: global: 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" @@ -118,4 +23,5 @@ after_test: - "IF \"%TOXENV:~-8,8%\" == \"-nocover\" %WITH_COMPILER% %TOXPYTHON% setup.py bdist_wheel" artifacts: - path: dist\* - +on_finish: + - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) From cfe4a03e58a779b183041bdf66e0510f71bb9228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= Date: Wed, 16 Sep 2015 23:49:57 +0300 Subject: [PATCH 2/6] fasdfasdf --- appveyor.yml | 11 +++++++---- ci/appveyor-with-compiler.cmd | 19 +++++++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 78e9054..e98c575 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,18 +10,21 @@ environment: PYTHON_VERSION: "3.5" PYTHON_ARCH: "64" init: - - "ECHO %TOXENV%" - - ps: "ls C:\\Python*" + - ECHO %TOXENV% + - ps: ls C:\Python install: - - "python -u ci\\appveyor-bootstrap.py" + - python -u ci\\appveyor-bootstrap.py test_script: - "%PYTHON_HOME%\\Scripts\\tox --version" - "%PYTHON_HOME%\\Scripts\\virtualenv --version" - "%PYTHON_HOME%\\Scripts\\pip --version" - "%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\* +on_failure: + - ps: dir env: + - ps: get-content .tox\*\log\* on_finish: - 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 index e1a1adb..5d81aa8 100644 --- a/ci/appveyor-with-compiler.cmd +++ b/ci/appveyor-with-compiler.cmd @@ -19,18 +19,29 @@ :: 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" +SET WIN_WDK_TMP="c:\Program Files (x86)\Windows Kits\10\Include\0wdf" 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 EXISTS %WIN_WDK% ( + REM See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/ + RENAME %WIN_WDK% %WIN_WDK_TMP% + ) + 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 From d5eb7cee37e653a806346d76ae0b8af97cc71801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= Date: Wed, 16 Sep 2015 23:57:54 +0300 Subject: [PATCH 3/6] asdf --- appveyor.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e98c575..ce84b3a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,29 +2,29 @@ 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: "3.5-nocover" - TOXPYTHON: "C:\\Python35-x64\\python.exe" - PYTHON_HOME: "C:\\Python35-x64" - PYTHON_VERSION: "3.5" - PYTHON_ARCH: "64" + - TOXENV: '3.5-nocover' + TOXPYTHON: 'C:\Python35-x64\python.exe' + PYTHON_HOME: 'C:\Python35-x64' + PYTHON_VERSION: '3.5' + PYTHON_ARCH: '64' init: - ECHO %TOXENV% - ps: ls C:\Python install: - - python -u ci\\appveyor-bootstrap.py + - python -u ci\appveyor-bootstrap.py test_script: - - "%PYTHON_HOME%\\Scripts\\tox --version" - - "%PYTHON_HOME%\\Scripts\\virtualenv --version" - - "%PYTHON_HOME%\\Scripts\\pip --version" - - "%WITH_COMPILER% %PYTHON_HOME%\\Scripts\\tox" + - '%PYTHON_HOME%\Scripts\tox --version' + - '%PYTHON_HOME%\Scripts\virtualenv --version' + - '%PYTHON_HOME%\Scripts\pip --version' + - '%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\* + - ps: 'dir env:' + - ps: 'get-content .tox\*\log\*' on_finish: - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) From 6af9eb68871b56d5238f27cfc4a9ebc1ac824ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= Date: Thu, 17 Sep 2015 00:02:27 +0300 Subject: [PATCH 4/6] asdf --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ce84b3a..f58bc19 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,8 +10,8 @@ environment: 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 test_script: From f420bedd34d5e1f277d692b5308fe3df3e8e07a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= Date: Thu, 17 Sep 2015 00:06:00 +0300 Subject: [PATCH 5/6] Doh --- ci/appveyor-with-compiler.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/appveyor-with-compiler.cmd b/ci/appveyor-with-compiler.cmd index 5d81aa8..c7027cb 100644 --- a/ci/appveyor-with-compiler.cmd +++ b/ci/appveyor-with-compiler.cmd @@ -25,7 +25,7 @@ ECHO SDK: %WINDOWS_SDK_VERSION% ARCH: %PYTHON_ARCH% IF "%PYTHON_VERSION%"=="3.5" ( - IF EXISTS %WIN_WDK% ( + IF EXIST %WIN_WDK% ( REM See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/ RENAME %WIN_WDK% %WIN_WDK_TMP% ) From f346b2f27678bf934661856f64ce4a8343b10aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= Date: Thu, 17 Sep 2015 00:11:56 +0300 Subject: [PATCH 6/6] asdfasdf --- appveyor.yml | 5 +++-- ci/appveyor-with-compiler.cmd | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f58bc19..8cb286c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,10 +14,11 @@ init: - ps: 'ls C:\Python*' install: - python -u ci\appveyor-bootstrap.py -test_script: - - '%PYTHON_HOME%\Scripts\tox --version' - '%PYTHON_HOME%\Scripts\virtualenv --version' + - '%PYTHON_HOME%\Scripts\easy_install --version' - '%PYTHON_HOME%\Scripts\pip --version' + - '%PYTHON_HOME%\Scripts\tox --version' +test_script: - '%WITH_COMPILER% %PYTHON_HOME%\Scripts\tox' after_test: - 'IF "%TOXENV:~-8,8%" == "-nocover" %WITH_COMPILER% %TOXPYTHON% setup.py bdist_wheel' diff --git a/ci/appveyor-with-compiler.cmd b/ci/appveyor-with-compiler.cmd index c7027cb..7f82a02 100644 --- a/ci/appveyor-with-compiler.cmd +++ b/ci/appveyor-with-compiler.cmd @@ -20,14 +20,13 @@ 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" -SET WIN_WDK_TMP="c:\Program Files (x86)\Windows Kits\10\Include\0wdf" ECHO SDK: %WINDOWS_SDK_VERSION% ARCH: %PYTHON_ARCH% IF "%PYTHON_VERSION%"=="3.5" ( IF EXIST %WIN_WDK% ( REM See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/ - RENAME %WIN_WDK% %WIN_WDK_TMP% + REN %WIN_WDK% 0wdf ) GOTO main )