diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2015-09-04 07:47:37 -0400 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-09-04 07:47:37 -0400 |
commit | d85df1450667f9b695348527729d2bb3df85870c (patch) | |
tree | 0eaaea935661341bcf1049bb30bd3dec8466e0a2 | |
parent | 435e7dc8cf37e24eaa8665231c3cf30e5a161b92 (diff) | |
download | python-coveragepy-d85df1450667f9b695348527729d2bb3df85870c.tar.gz |
Try to get 64-bit builds
-rw-r--r-- | appveyor.yml | 40 | ||||
-rw-r--r-- | ci/appveyor-bootstrap.ps1 | 88 | ||||
-rw-r--r-- | ci/appveyor-with-compiler.cmd | 37 |
3 files changed, 23 insertions, 142 deletions
diff --git a/appveyor.yml b/appveyor.yml index cd73b22..c81e97c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,23 +40,29 @@ environment: PYTHON_VERSION: "3.5.0rc2" PYTHON_ARCH: "32" - # - JOB: "2.7 64-bit" - # TOXENV: "py27" - # PYTHON: "C:\\Python27-x64" - # PYTHON_VERSION: "2.7" - # PYTHON_ARCH: "64" - # - # - JOB: "3.3 64-bit" - # TOXENV: "py33" - # PYTHON: "C:\\Python33-x64" - # PYTHON_VERSION: "3.3" - # PYTHON_ARCH: "64" - # - # - JOB: "3.4 64-bit" - # TOXENV: "py34" - # PYTHON: "C:\\Python34-x64" - # PYTHON_VERSION: "3.4" - # PYTHON_ARCH: "64" + - JOB: "2.7 64-bit" + TOXENV: "py27" + PYTHON: "C:\\Python27-x64" + PYTHON_VERSION: "2.7" + PYTHON_ARCH: "64" + + - JOB: "3.3 64-bit" + TOXENV: "py33" + PYTHON: "C:\\Python33-x64" + PYTHON_VERSION: "3.3" + PYTHON_ARCH: "64" + + - JOB: "3.4 64-bit" + TOXENV: "py34" + PYTHON: "C:\\Python34-x64" + PYTHON_VERSION: "3.4" + PYTHON_ARCH: "64" + + - JOB: "3.5 64-bit" + TOXENV: "py35" + PYTHON: "C:\\Python35rc2-x64" + PYTHON_VERSION: "3.5.0rc2" + PYTHON_ARCH: "64" # Meta coverage - JOB: "Meta 2.7" diff --git a/ci/appveyor-bootstrap.ps1 b/ci/appveyor-bootstrap.ps1 deleted file mode 100644 index 6cc60b0..0000000 --- a/ci/appveyor-bootstrap.ps1 +++ /dev/null @@ -1,88 +0,0 @@ -# Source: https://github.com/pypa/python-packaging-user-guide/blob/master/source/code/install.ps1 -# Sample script to install Python and pip under Windows -# Authors: Olivier Grisel and Kyle Kastner -# License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/ - -$BASE_URL = "https://www.python.org/ftp/python/" -$GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py" -$GET_PIP_PATH = "C:\get-pip.py" - - -function DownloadPython ($python_version, $prerelease, $platform_suffix) { - $webclient = New-Object System.Net.WebClient - $filename = "python-" + $python_version + $prerelease + $platform_suffix + ".msi" - $url = $BASE_URL + $python_version + "/" + $filename - - $basedir = $pwd.Path + "\" - $filepath = $basedir + $filename - if (Test-Path $filename) { - Write-Host "Reusing" $filepath - return $filepath - } - - # Download and retry up to 5 times in case of network transient errors. - Write-Host "Downloading" $filename "from" $url - $retry_attempts = 3 - for ($i=0; $i -lt $retry_attempts; $i++) { - try { - $webclient.DownloadFile($url, $filepath) - break - } - Catch [Exception] { - Start-Sleep 1 - } - } - Write-Host "File saved at" $filepath - return $filepath -} - - -function InstallPython ($python_version, $prerelease, $architecture, $python_home) { - Write-Host "Installing Python" $python_version "for" $architecture "bit architecture to" $python_home - if (Test-Path $python_home) { - Write-Host $python_home "already exists, skipping." - return $false - } - if ($architecture -eq "32") { - $platform_suffix = "" - } else { - $platform_suffix = ".amd64" - } - $filepath = DownloadPython $python_version $prerelease $platform_suffix - Write-Host "Installing" $filepath "to" $python_home - $args = "/qn /i $filepath TARGETDIR=$python_home" - Write-Host "msiexec.exe" $args - Start-Process -FilePath "msiexec.exe" -ArgumentList $args -Wait -Passthru - Write-Host "Python $python_version ($architecture) installation complete" - return $true -} - - -function InstallPip ($python_home) { - $pip_path = $python_home + "/Scripts/pip.exe" - $python_path = $python_home + "/python.exe" - if (-not(Test-Path $pip_path)) { - Write-Host "Installing pip..." - $webclient = New-Object System.Net.WebClient - $webclient.DownloadFile($GET_PIP_URL, $GET_PIP_PATH) - Write-Host "Executing:" $python_path $GET_PIP_PATH - Start-Process -FilePath "$python_path" -ArgumentList "$GET_PIP_PATH" -Wait -Passthru - } else { - Write-Host "pip already installed." - } -} - -function InstallPackage ($python_home, $pkg) { - $pip_path = $python_home + "/Scripts/pip.exe" - & $pip_path install $pkg -} - -function main () { - InstallPython $env:PYTHON_VERSION $env:PYTHON_PRERELEASE $env:PYTHON_ARCH $env:PYTHON_HOME - InstallPip $env:PYTHON_HOME - InstallPackage $env:PYTHON_HOME setuptools==18.2 - InstallPackage $env:PYTHON_HOME wheel==0.24.0 - InstallPackage $env:PYTHON_HOME tox==2.1.1 -} - -main diff --git a/ci/appveyor-with-compiler.cmd b/ci/appveyor-with-compiler.cmd deleted file mode 100644 index 3619733..0000000 --- a/ci/appveyor-with-compiler.cmd +++ /dev/null @@ -1,37 +0,0 @@ -:: To build extensions for 64 bit Python 3, we need to configure environment -:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of: -:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1) -:: -:: To build extensions for 64 bit Python 2, we need to configure environment -:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of: -:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0) -:: -:: 32 bit builds do not require specific environment configurations. -:: -:: Note: this script needs to be run with the /E:ON and /V:ON flags for the -:: cmd interpreter, at least for (SDK v7.0) -:: -:: More details at: -:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows -:: http://stackoverflow.com/a/13751649/163740 -:: -:: Author: Olivier Grisel -:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/ -@ECHO OFF - -SET COMMAND_TO_RUN=%* -SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows - -IF "%PYTHON_ARCH%"=="64" ( - ECHO SDK: %WINDOWS_SDK_VERSION% ARCH: %PYTHON_ARCH% - SET DISTUTILS_USE_SDK=1 - SET MSSdk=1 - "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION% - "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release - ECHO Executing: %COMMAND_TO_RUN% - call %COMMAND_TO_RUN% || EXIT 1 -) ELSE ( - ECHO SDK: %WINDOWS_SDK_VERSION% ARCH: %PYTHON_ARCH% - ECHO Executing: %COMMAND_TO_RUN% - call %COMMAND_TO_RUN% || EXIT 1 -) |