diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..efb75dde --- /dev/null +++ b/.travis.yml @@ -0,0 +1,42 @@ +sudo: false +language: python +# command to install dependencies +install: "make" +# command to run tests +script: + - | + if [[ "$TRAVIS_PYTHON_VERSION" != "2.6" ]] ; then make test-readme; fi + - make ci +cache: pip +jobs: + include: + - stage: test + script: + - make test-readme + - make ci + python: '2.7' + - stage: test + script: + - make test-readme + - make ci + python: '3.4' + - stage: test + script: + - make test-readme + - make ci + python: '3.5' + - stage: test + script: + - make test-readme + - make ci + python: '3.6' + - stage: test + script: + - make test-readme + - make ci + python: '3.7' + dist: xenial + sudo: true + - stage: coverage + python: 3.6 + script: codecov diff --git a/README.md b/README.md index 083fd48e..ee3b2bf5 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ Requests: HTTP for Humans™ [![codecov.io](https://codecov.io/github/requests/requests/coverage.svg?branch=master)](https://codecov.io/github/requests/requests) [![image](https://img.shields.io/github/contributors/requests/requests.svg)](https://github.com/requests/requests/graphs/contributors) [![image](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/kennethreitz) -[![Build Status](https://kennethreitz.visualstudio.com/requests/_apis/build/status/requests-CI)](https://kennethreitz.visualstudio.com/requests/_build/latest?definitionId=1) **If you're interested in financially supporting Kenneth Reitz open source, consider [visiting this link](https://cash.me/$KennethReitz). Your support helps tremendously with sustainability of motivation, as Open Source is no longer part of my day job.** diff --git a/_appveyor/install.ps1 b/_appveyor/install.ps1 new file mode 100644 index 00000000..160ba55c --- /dev/null +++ b/_appveyor/install.ps1 @@ -0,0 +1,229 @@ +# 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/_azure-pipelines/template-linux.yml b/_azure-pipelines/template-linux.yml new file mode 100644 index 00000000..a4658d5f --- /dev/null +++ b/_azure-pipelines/template-linux.yml @@ -0,0 +1,33 @@ +jobs: +- job: Linux + pool: + vmImage: 'Ubuntu-16.04' + strategy: + matrix: + Python27: + PYTHON_VERSION: '2.7' + Python34: + PYTHON_VERSION: '3.4' + Python35: + PYTHON_VERSION: '3.5' + Python36: + PYTHON_VERSION: '3.6' + Python37: + PYTHON_VERSION: '3.7' + steps: + - task: UsePythonVersion@0 + inputs: + versionSpec: $(PYTHON_VERSION) + displayName: 'Install Python' + - script: | + make + make test-readme + make ci + - script: | + pipenv run codecov + displayName: 'Coverage' + - task: PublishTestResults@2 + displayName: 'Publish test results' + inputs: + testResultsFiles: 'report.xml' + testRunTitle: Python $(PYTHON_VERSION) diff --git a/_azure-pipelines/template-windows.yml b/_azure-pipelines/template-windows.yml new file mode 100644 index 00000000..1f3b8db2 --- /dev/null +++ b/_azure-pipelines/template-windows.yml @@ -0,0 +1,36 @@ +jobs: +- job: Windows + pool: + vmImage: 'vs2017-win2016' + strategy: + matrix: + Python27: + PYTHON_VERSION: '2.7' + Python34: + PYTHON_VERSION: '3.4' + Python35: + PYTHON_VERSION: '3.5' + Python36: + PYTHON_VERSION: '3.6' + Python37: + PYTHON_VERSION: '3.7' + steps: + - task: UsePythonVersion@0 + inputs: + versionSpec: $(PYTHON_VERSION) + architecture: 'x64' + displayName: 'Install Python' + - script: | + make init + python -m pip install --upgrade pip wheel + displayName: 'Ensure latest' + - script: | + make + pipenv install -e .[socks] --skip-lock + - script: | + make coverage + displayName: 'Test script' + - script: | + pipenv run codecov -f coverage.xml + displayName: 'Coverage' + diff --git a/_azure-pipelines/template.yml b/_azure-pipelines/template.yml deleted file mode 100644 index 3b3d43ba..00000000 --- a/_azure-pipelines/template.yml +++ /dev/null @@ -1,41 +0,0 @@ -jobs: -- job: ${{ parameters.name }} - pool: - vmImage: ${{ parameters.vmImage }} - strategy: - matrix: - Python27: - PYTHON_VERSION: '2.7' - Python34: - PYTHON_VERSION: '3.4' - Python35: - PYTHON_VERSION: '3.5' - Python36: - PYTHON_VERSION: '3.6' - Python37: - PYTHON_VERSION: '3.7' - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: $(PYTHON_VERSION) - architecture: 'x64' - displayName: 'Install Python' - - script: | - make - pipenv install -e .[socks] --skip-lock - displayName: 'Set up' - - - ${{ if eq(parameters.name, 'Linux') }}: - - script: | - make test-readme - make ci - displayName: 'Test and CI' - - task: PublishTestResults@2 - displayName: 'Publish test results' - inputs: - testResultsFiles: 'report.xml' - testRunTitle: Python $(PYTHON_VERSION) - - - script: | - pipenv run codecov -f coverage.xml - displayName: 'Run codecov' diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..3b6cef63 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,57 @@ +# AppVeyor.yml from https://github.com/ogrisel/python-appveyor-demo +# License: CC0 1.0 Universal: https://creativecommons.org/publicdomain/zero/1.0/ + +build: off + +environment: + matrix: + - PYTHON: "C:\\Python27-x64" + PYTHON_VERSION: "2.7.x" + PYTHON_ARCH: "64" + TOXENV: "py27" + + - PYTHON: "C:\\Python34-x64" + PYTHON_VERSION: "3.4.x" + PYTHON_ARCH: "64" + TOXENV: "py34" + + - PYTHON: "C:\\Python35-x64" + PYTHON_VERSION: "3.5.x" + PYTHON_ARCH: "64" + TOXENV: "py35" + + - PYTHON: "C:\\Python36-x64" + PYTHON_VERSION: "3.6.x" + PYTHON_ARCH: "64" + TOXENV: "py36" + + - PYTHON: "C:\\Python37-x64" + PYTHON_VERSION: "3.7.x" + PYTHON_ARCH: "64" + TOXENV: "py37" + +install: + # Install Python (from the official .msi of https://www.python.org/) and pip when + # not already installed. + - ps: if (-not(Test-Path($env:PYTHON))) { & _appveyor\install.ps1 } + + # Prepend newly installed 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%" + + # Check that we have the expected version and architecture for Python + - "python --version" + - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" + + # Upgrade to the latest version of pip to avoid it displaying warnings + # about it being out of date. + - "python -m pip install --upgrade pip wheel" + - "C:\\MinGW\\bin\\mingw32-make" + - "pipenv install -e .[socks] --skip-lock" + +test_script: + - "C:\\MinGW\\bin\\mingw32-make coverage" + +on_success: + - "pipenv run codecov -f coverage.xml" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b8e7e0d0..68eeedde 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,10 +1,4 @@ jobs: -- template: _azure-pipelines/template.yml - parameters: - name: Linux - vmImage: Ubuntu-16.04 +- template: _azure-pipelines/template-linux.yml -- template: _azure-pipelines/template.yml - parameters: - name: Windows - vmImage: vs2017-win2016 \ No newline at end of file +- template: _azure-pipelines/template-windows.yml