From 724ed273e771375d73ddea0a1a3a224bae5b7364 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Wed, 1 Nov 2017 10:57:42 -0700 Subject: [PATCH] Updating AppVeyor configuration. In particular: - Removing `install.ps1` (all the needed Python versions are already there) - Removing `run_with_env.cmd` (and usage of it) since our code is pure Python and all of our dependencies have Windows wheels - Dropping distinction between PYTHON_VERSION and PYTHON_MAJMIN_VERSION, since AppVeyor will update anyhow - Programmatically computing PYTHON_(ARCH|VERSION) - Adding a more comprehensive `env_info.py` instead of using `python -c` - Removing `after_test` section that built MSI / WinInst and corresponding `artifacts` section that upload them - Removing `build_script` section that just runs `setup.py build` (it's irrelevant since we are pure Python) - Using the absolute path to `nox.exe` rather than hacking by deleting `%APPVEYOR_BUILD_FOLDER%/nox.py` --- appveyor.yml | 122 +++++++------------- appveyor/env_info.py | 48 ++++++++ appveyor/install.ps1 | 229 -------------------------------------- appveyor/run_with_env.cmd | 88 --------------- 4 files changed, 87 insertions(+), 400 deletions(-) create mode 100644 appveyor/env_info.py delete mode 100644 appveyor/install.ps1 delete mode 100644 appveyor/run_with_env.cmd diff --git a/appveyor.yml b/appveyor.yml index 4d75dfdaaf23a..042cb10f1724c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,12 +1,8 @@ version: 1.0.{build}.{branch} -environment: - global: - # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the - # /E:ON and /V:ON options are not enabled in the batch script intepreter - # See: http://stackoverflow.com/a/13751649/163740 - CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd" +build: off +environment: matrix: # Pre-installed Python versions, which Appveyor may upgrade to @@ -17,98 +13,58 @@ environment: # This is because it takes too long to serially go through six to eight # iterations. - # Python 2.7.11 is the latest Python 2.7 with a Windows installer - # Python 2.7.13 is the overall latest - # https://www.python.org/ftp/python/2.7.11/ - PYTHON: "C:\\Python27" - PYTHON_VERSION: "2.7.11" - PYTHON_MAJMIN_VERSION: "2.7" - PYTHON_ARCH: "32" NOX_ENV: "unit_tests(python_version='2.7')" - # Python 3.5.1 is the latest Python 3.5 with a Windows installer - # Python 3.5.3 is the overall latest - # https://www.python.org/ftp/python/3.5.1/ - PYTHON: "C:\\Python35-x64" - PYTHON_VERSION: "3.5.1" - PYTHON_MAJMIN_VERSION: "3.5" - PYTHON_ARCH: "64" NOX_ENV: "unit_tests(python_version='3.5')" install: - - ECHO "Filesystem root:" - - ps: "ls \"C:/\"" - - - ECHO "Installed SDKs:" - - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\"" + - cmd: echo "Filesystem root:" + - dir C:\ - # Install Python (from the official .msi of http://python.org) and pip when - # not already installed. - - ps: if (-not(Test-Path($env:PYTHON))) { & appveyor\install.ps1 } + - echo "Installed SDKs:" + - dir "C:\Program Files\Microsoft SDKs\Windows" - # Prepend newly installed Python to the PATH of this build (this cannot be + # Prepend "current" Python to the PATH of this build (this cannot be # done from inside the powershell script as it would require to restart # the parent CMD process). - - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" + - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH% - # Check that we have the expected version and architecture for Python - - "python --version" - - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" + # https://stackoverflow.com/a/4509885/1068170 + # Set `PYTHON_ARCH` (either 32 or 64) + - set PY_CMD=python -c "import platform; print(platform.architecture()[0][:2])" + - for /f "tokens=1 delims=" %%i in ('%PY_CMD%') do set PYTHON_ARCH=%%i + # Set `PYTHON_VERSION` + - set PY_CMD=python -c "import platform; print(platform.python_version())" + - for /f "tokens=1 delims=" %%i in ('%PY_CMD%') do set PYTHON_VERSION=%%i - # Upgrade to the latest version of pip to avoid it displaying warnings - # about it being out of date. - - "pip install --disable-pip-version-check --user --upgrade pip" + # Check that we have the expected version and architecture for Python + - python appveyor\env_info.py - # Install the build dependencies of the project. If some dependencies contain - # compiled extensions and are not provided as pre-built wheel packages, - # pip will build them from source using the MSVC compiler matching the - # target Python version and architecture - - "%CMD_IN_ENV% pip install -r appveyor/requirements.txt" + # Upgrade to the latest version of pip. + - python -m pip install --upgrade pip setuptools -build_script: - # Build the compiled extension - - "%CMD_IN_ENV% python setup.py build" + # Install the build dependencies of the project (assumes all extensions + # are pure Python or have wheels, so they don't need to be built). + - python -m pip install -r appveyor\requirements.txt test_script: - - "%CMD_IN_ENV% pip list" - - # AppVeyor gets confused by a nox.py file in the root, and tries to - # import from it instead of importing actual nox. - # - # This is an annoying problem, but we do not need to build docs here, - # so this is a hack-solution to get around it. I am okay with this in the - # short term because docs will move into their own packages soon, and this - # file will disappear completely. - - '%CMD_IN_ENV% del nox.py' - - - '%CMD_IN_ENV% dir' - - '%CMD_IN_ENV% dir bigquery' - # Run the project tests - - '%CMD_IN_ENV% nox -f bigquery\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f bigtable\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f core\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f datastore\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f dns\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f error_reporting\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f language\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f logging\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f monitoring\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f pubsub\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f resource_manager\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f runtimeconfig\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f spanner\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f speech\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f storage\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f translate\nox.py -s "%NOX_ENV%"' - - '%CMD_IN_ENV% nox -f vision\nox.py -s "%NOX_ENV%"' - -after_test: - # If tests are successful, create binary packages for the project. - - "%CMD_IN_ENV% python setup.py bdist_wininst" - - "%CMD_IN_ENV% python setup.py bdist_msi" - - ps: "ls dist" - -artifacts: - # Archive the generated packages in the ci.appveyor.com build report. - - path: dist\* + - %PYTHON%\Scripts\nox.exe -f bigquery\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f bigtable\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f core\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f datastore\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f dns\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f error_reporting\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f language\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f logging\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f monitoring\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f pubsub\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f resource_manager\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f runtimeconfig\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f spanner\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f speech\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f storage\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f translate\nox.py -s %NOX_ENV% + - %PYTHON%\Scripts\nox.exe -f vision\nox.py -s %NOX_ENV% diff --git a/appveyor/env_info.py b/appveyor/env_info.py new file mode 100644 index 0000000000000..ec8142bbefd59 --- /dev/null +++ b/appveyor/env_info.py @@ -0,0 +1,48 @@ +# Copyright 2017 Google LLC All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Get environment information.""" + +from __future__ import print_function + +import os +import struct +import sys + + +def env_var(var_name): + value = os.environ.get(var_name) + print('os.environ[{!r}]: {}'.format(var_name, value)) + + +def main(): + print('os.name: {}'.format(os.name)) + env_var('PYTHON_ARCH') + env_var('PYTHON_VERSION') + print('sys.platform: {}'.format(sys.platform)) + + if sys.maxsize == 2**63 - 1: + print('sys.maxsize: 2^(63) - 1') + elif sys.maxsize == 2**31 - 1: + print('sys.maxsize: 2^(31) - 1') + else: + print('sys.maxsize: {}'.format(sys.maxsize)) + + print('sys.version:\n{}'.format(sys.version)) + bitness = struct.calcsize('P') * 8 + print('struct.calcsize(\'P\') * 8: {}'.format(bitness)) + + +if __name__ == '__main__': + main() diff --git a/appveyor/install.ps1 b/appveyor/install.ps1 deleted file mode 100644 index 160ba55c07370..0000000000000 --- a/appveyor/install.ps1 +++ /dev/null @@ -1,229 +0,0 @@ -# Sample script to install Python and pip under Windows -# Authors: Olivier Grisel, Jonathan Helmus, Kyle Kastner, and Alex Willmer -# License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/ - -$MINICONDA_URL = "http://repo.continuum.io/miniconda/" -$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" - -$PYTHON_PRERELEASE_REGEX = @" -(?x) -(?\d+) -\. -(?\d+) -\. -(?\d+) -(?[a-z]{1,2}\d+) -"@ - - -function Download ($filename, $url) { - $webclient = New-Object System.Net.WebClient - - $basedir = $pwd.Path + "\" - $filepath = $basedir + $filename - if (Test-Path $filename) { - Write-Host "Reusing" $filepath - return $filepath - } - - # Download and retry up to 3 times in case of network transient errors. - Write-Host "Downloading" $filename "from" $url - $retry_attempts = 2 - for ($i = 0; $i -lt $retry_attempts; $i++) { - try { - $webclient.DownloadFile($url, $filepath) - break - } - Catch [Exception]{ - Start-Sleep 1 - } - } - if (Test-Path $filepath) { - Write-Host "File saved at" $filepath - } else { - # Retry once to get the error message if any at the last try - $webclient.DownloadFile($url, $filepath) - } - return $filepath -} - - -function ParsePythonVersion ($python_version) { - if ($python_version -match $PYTHON_PRERELEASE_REGEX) { - return ([int]$matches.major, [int]$matches.minor, [int]$matches.micro, - $matches.prerelease) - } - $version_obj = [version]$python_version - return ($version_obj.major, $version_obj.minor, $version_obj.build, "") -} - - -function DownloadPython ($python_version, $platform_suffix) { - $major, $minor, $micro, $prerelease = ParsePythonVersion $python_version - - if (($major -le 2 -and $micro -eq 0) ` - -or ($major -eq 3 -and $minor -le 2 -and $micro -eq 0) ` - ) { - $dir = "$major.$minor" - $python_version = "$major.$minor$prerelease" - } else { - $dir = "$major.$minor.$micro" - } - - if ($prerelease) { - if (($major -le 2) ` - -or ($major -eq 3 -and $minor -eq 1) ` - -or ($major -eq 3 -and $minor -eq 2) ` - -or ($major -eq 3 -and $minor -eq 3) ` - ) { - $dir = "$dir/prev" - } - } - - if (($major -le 2) -or ($major -le 3 -and $minor -le 4)) { - $ext = "msi" - if ($platform_suffix) { - $platform_suffix = ".$platform_suffix" - } - } else { - $ext = "exe" - if ($platform_suffix) { - $platform_suffix = "-$platform_suffix" - } - } - - $filename = "python-$python_version$platform_suffix.$ext" - $url = "$BASE_URL$dir/$filename" - $filepath = Download $filename $url - return $filepath -} - - -function InstallPython ($python_version, $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" - } - $installer_path = DownloadPython $python_version $platform_suffix - $installer_ext = [System.IO.Path]::GetExtension($installer_path) - Write-Host "Installing $installer_path to $python_home" - $install_log = $python_home + ".log" - if ($installer_ext -eq '.msi') { - InstallPythonMSI $installer_path $python_home $install_log - } else { - InstallPythonEXE $installer_path $python_home $install_log - } - if (Test-Path $python_home) { - Write-Host "Python $python_version ($architecture) installation complete" - } else { - Write-Host "Failed to install Python in $python_home" - Get-Content -Path $install_log - Exit 1 - } -} - - -function InstallPythonEXE ($exepath, $python_home, $install_log) { - $install_args = "/quiet InstallAllUsers=1 TargetDir=$python_home" - RunCommand $exepath $install_args -} - - -function InstallPythonMSI ($msipath, $python_home, $install_log) { - $install_args = "/qn /log $install_log /i $msipath TARGETDIR=$python_home" - $uninstall_args = "/qn /x $msipath" - RunCommand "msiexec.exe" $install_args - if (-not(Test-Path $python_home)) { - Write-Host "Python seems to be installed else-where, reinstalling." - RunCommand "msiexec.exe" $uninstall_args - RunCommand "msiexec.exe" $install_args - } -} - -function RunCommand ($command, $command_args) { - Write-Host $command $command_args - Start-Process -FilePath $command -ArgumentList $command_args -Wait -Passthru -} - - -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 - & $python_path $GET_PIP_PATH - } else { - Write-Host "pip already installed." - } -} - - -function DownloadMiniconda ($python_version, $platform_suffix) { - if ($python_version -eq "3.4") { - $filename = "Miniconda3-3.5.5-Windows-" + $platform_suffix + ".exe" - } else { - $filename = "Miniconda-3.5.5-Windows-" + $platform_suffix + ".exe" - } - $url = $MINICONDA_URL + $filename - $filepath = Download $filename $url - return $filepath -} - - -function InstallMiniconda ($python_version, $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 = "x86" - } else { - $platform_suffix = "x86_64" - } - $filepath = DownloadMiniconda $python_version $platform_suffix - Write-Host "Installing" $filepath "to" $python_home - $install_log = $python_home + ".log" - $args = "/S /D=$python_home" - Write-Host $filepath $args - Start-Process -FilePath $filepath -ArgumentList $args -Wait -Passthru - if (Test-Path $python_home) { - Write-Host "Python $python_version ($architecture) installation complete" - } else { - Write-Host "Failed to install Python in $python_home" - Get-Content -Path $install_log - Exit 1 - } -} - - -function InstallMinicondaPip ($python_home) { - $pip_path = $python_home + "\Scripts\pip.exe" - $conda_path = $python_home + "\Scripts\conda.exe" - if (-not(Test-Path $pip_path)) { - Write-Host "Installing pip..." - $args = "install --yes pip" - Write-Host $conda_path $args - Start-Process -FilePath "$conda_path" -ArgumentList $args -Wait -Passthru - } else { - Write-Host "pip already installed." - } -} - -function main () { - InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON - InstallPip $env:PYTHON -} - -main diff --git a/appveyor/run_with_env.cmd b/appveyor/run_with_env.cmd deleted file mode 100644 index 5da547c499eea..0000000000000 --- a/appveyor/run_with_env.cmd +++ /dev/null @@ -1,88 +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, and 64-bit builds for 3.5 and beyond, 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/ -:: -:: Notes about batch files for Python people: -:: -:: Quotes in values are literally part of the values: -:: SET FOO="bar" -:: FOO is now five characters long: " b a r " -:: If you don't want quotes, don't include them on the right-hand side. -:: -:: The CALL lines at the end of this file look redundant, but if you move them -:: outside of the IF clauses, they do not run properly in the SET_SDK_64==Y -:: case, I don't know why. -@ECHO OFF - -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 - -:: Extract the major and minor versions, and allow for the minor version to be -:: more than 9. This requires the version number to have two dots in it. -SET MAJOR_PYTHON_VERSION=%PYTHON_VERSION:~0,1% -IF "%PYTHON_VERSION:~3,1%" == "." ( - SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1% -) ELSE ( - SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,2% -) - -:: Based on the Python version, determine what SDK version to use, and whether -:: to set the SDK for 64-bit. -IF %MAJOR_PYTHON_VERSION% == 2 ( - SET WINDOWS_SDK_VERSION="v7.0" - SET SET_SDK_64=Y -) ELSE ( - IF %MAJOR_PYTHON_VERSION% == 3 ( - SET WINDOWS_SDK_VERSION="v7.1" - IF %MINOR_PYTHON_VERSION% LEQ 4 ( - SET SET_SDK_64=Y - ) ELSE ( - SET SET_SDK_64=N - IF EXIST "%WIN_WDK%" ( - :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/ - REN "%WIN_WDK%" 0wdf - ) - ) - ) ELSE ( - ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%" - EXIT 1 - ) -) - -IF %PYTHON_ARCH% == 64 ( - IF %SET_SDK_64% == Y ( - ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture - 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 Using default MSVC build environment for 64 bit architecture - ECHO Executing: %COMMAND_TO_RUN% - call %COMMAND_TO_RUN% || EXIT 1 - ) -) ELSE ( - ECHO Using default MSVC build environment for 32 bit architecture - ECHO Executing: %COMMAND_TO_RUN% - call %COMMAND_TO_RUN% || EXIT 1 -)