From 0ea511c405b0e47389c23bfc8711bfa8a165a872 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 11:29:38 -0500 Subject: [PATCH 01/53] empty commit From 3cdbfba65a1c11167cb85b59f7de8e1bf0943f3d Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 11:31:33 -0500 Subject: [PATCH 02/53] remove test badges Signed-off-by: Kenneth Reitz --- README.rst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.rst b/README.rst index 91734643..a80fd0ac 100644 --- a/README.rst +++ b/README.rst @@ -10,12 +10,6 @@ Pipenv: Python Development Workflow for Humans .. image:: https://img.shields.io/pypi/pyversions/pipenv.svg :target: https://pypi.python.org/pypi/pipenv -.. image:: https://travis-ci.org/pypa/pipenv.svg?branch=master - :target: https://travis-ci.org/pypa/pipenv - -.. image:: https://img.shields.io/appveyor/ci/kennethreitz/pipenv.svg - :target: https://ci.appveyor.com/project/kennethreitz/pipenv/branch/master - .. image:: https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg :target: https://saythanks.io/to/kennethreitz From e86dfd82a7bb6023d0263235beec1412dfbbbee3 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:24:59 -0500 Subject: [PATCH 03/53] empty commit From 81eb90d7583f173f7c0d2624a15161821b288307 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:36:54 -0500 Subject: [PATCH 04/53] empty commit From d87064f7dd988dfb0ab875a9a273a42054d8cc63 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:39:28 -0500 Subject: [PATCH 05/53] windows Signed-off-by: Kenneth Reitz --- run-tests.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/run-tests.sh b/run-tests.sh index fa4d52c6..7726d9cb 100644 --- a/run-tests.sh +++ b/run-tests.sh @@ -21,4 +21,10 @@ if [[ ! -z "$CI" ]]; then pipenv install --dev fi +if [[ ! -z "$WINDOWS" ]]; then + echo "Installing Pipenv…" + pip install -e . --upgrade --upgrade-strategy=only-if-needed + pipenv install --dev +fi + pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream | tee results.tap \ No newline at end of file From 8593a7109ac52f2cf828e7a87666f976efe8654a Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:40:32 -0500 Subject: [PATCH 06/53] empty commit From 2a1819f18d26a8d11b5acc5b05510370e32f0803 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:41:40 -0500 Subject: [PATCH 07/53] empty commit From 4cd02d2cb84f8186d6050f86651cded25783ab37 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:45:52 -0500 Subject: [PATCH 08/53] empty commit From cee56cca97e25d17e87aa31bb15a80a81afa41f2 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:47:00 -0500 Subject: [PATCH 09/53] empty commit From 733ef960b6348f854f977b0092ebd0568575a807 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:49:08 -0500 Subject: [PATCH 10/53] empty commit From 9ad1ab4fc2b0dc21b26256c9f70f7904f14d2660 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:50:37 -0500 Subject: [PATCH 11/53] empty commit From a5d80887c9bd74d12dd9723e8552c1fac8146e18 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:51:40 -0500 Subject: [PATCH 12/53] empty commit From 6b234066a8bd07f2123a0a21bbb532a10121b8ea Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:55:06 -0500 Subject: [PATCH 13/53] run-tests.bat Signed-off-by: Kenneth Reitz --- run-tests.bat | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 run-tests.bat diff --git a/run-tests.bat b/run-tests.bat new file mode 100644 index 00000000..6048ab54 --- /dev/null +++ b/run-tests.bat @@ -0,0 +1,4 @@ +pip install -e . --upgrade --upgrade-strategy=only-if-needed +pipenv install --dev + +pipenv run pytest -v -n auto tests --tap-stream \ No newline at end of file From 54d8a63686d6e81e5abedfed10ae1b5cf03d4e47 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:57:41 -0500 Subject: [PATCH 14/53] pipe to results.tap Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 6048ab54..97c5bba7 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,4 +1,4 @@ pip install -e . --upgrade --upgrade-strategy=only-if-needed pipenv install --dev -pipenv run pytest -v -n auto tests --tap-stream \ No newline at end of file +pipenv run pytest -v -n auto tests --tap-stream > results.tap \ No newline at end of file From e3c306c6cedea8ffdf6b15021bf13592a425f962 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:58:14 -0500 Subject: [PATCH 15/53] don't run concurrently on windows Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 97c5bba7..7139300f 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,4 +1,4 @@ pip install -e . --upgrade --upgrade-strategy=only-if-needed pipenv install --dev -pipenv run pytest -v -n auto tests --tap-stream > results.tap \ No newline at end of file +pipenv run pytest -v tests --tap-stream > results.tap \ No newline at end of file From 1c16a78c7a51dc28d3f8846de31ed257bcf44f7b Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 12:59:51 -0500 Subject: [PATCH 16/53] tee Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 7139300f..f092b219 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,4 +1,4 @@ pip install -e . --upgrade --upgrade-strategy=only-if-needed pipenv install --dev -pipenv run pytest -v tests --tap-stream > results.tap \ No newline at end of file +pipenv run pytest -v tests --tap-stream | tee results.tap \ No newline at end of file From 18e1fe75c478306d3c48aa0b173a6b020e4f94f8 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:02:02 -0500 Subject: [PATCH 17/53] empty commit From e339494c59069a5276a7009492d6b02e74741314 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:03:35 -0500 Subject: [PATCH 18/53] run in virtualenv Signed-off-by: Kenneth Reitz --- run-tests.bat | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/run-tests.bat b/run-tests.bat index f092b219..e82f058e 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,4 +1,6 @@ -pip install -e . --upgrade --upgrade-strategy=only-if-needed -pipenv install --dev +virtualenv .venv +.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed +.venv\Scripts\pipenv install --dev -pipenv run pytest -v tests --tap-stream | tee results.tap \ No newline at end of file + +.venv\Scripts\pipenv run pytest -v tests --tap-stream | tee results.tap \ No newline at end of file From a5b2cadba8e1ca97e7e0bec63d31e017c0213d1a Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:13:12 -0500 Subject: [PATCH 19/53] auto again on windows Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index e82f058e..6c97b216 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -3,4 +3,4 @@ virtualenv .venv .venv\Scripts\pipenv install --dev -.venv\Scripts\pipenv run pytest -v tests --tap-stream | tee results.tap \ No newline at end of file +.venv\Scripts\pipenv run -n auto pytest -v tests --tap-stream | tee results.tap \ No newline at end of file From 73f50b42fe6d254d4f216f0750aefb9f07d88e0b Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:14:58 -0500 Subject: [PATCH 20/53] replace / with \ on windows Signed-off-by: Kenneth Reitz --- tests/pytest-pypi/pytest_pypi/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pytest-pypi/pytest_pypi/app.py b/tests/pytest-pypi/pytest_pypi/app.py index 445e1f96..efcbe23d 100644 --- a/tests/pytest-pypi/pytest_pypi/app.py +++ b/tests/pytest-pypi/pytest_pypi/app.py @@ -68,7 +68,7 @@ def serve_package(package, release): for _release in package.releases: if _release.endswith(release): - return send_file(os.path.sep.join([PYPI_VENDOR_DIR, _release])) + return send_file(os.path.sep.join([PYPI_VENDOR_DIR, _release.replace('/', os.path.sep)])) abort(404) From 235ca6ffda6dc0f55df9217959855d624c9e8667 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:16:53 -0500 Subject: [PATCH 21/53] oops Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 6c97b216..ae1ecd21 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -3,4 +3,4 @@ virtualenv .venv .venv\Scripts\pipenv install --dev -.venv\Scripts\pipenv run -n auto pytest -v tests --tap-stream | tee results.tap \ No newline at end of file +.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream | tee results.tap \ No newline at end of file From ed0060bfaadb6a191f31a4c3e841d351a7139682 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:19:03 -0500 Subject: [PATCH 22/53] try --boxed Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index ae1ecd21..bfed8b84 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -3,4 +3,4 @@ virtualenv .venv .venv\Scripts\pipenv install --dev -.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream | tee results.tap \ No newline at end of file +.venv\Scripts\pipenv run pytest -n auto --boxed -v tests --tap-stream | tee results.tap \ No newline at end of file From 44eeffdcdc80d76e7dab70b57aea761e79ae812e Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:20:11 -0500 Subject: [PATCH 23/53] no concucurrency for windows Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index bfed8b84..e82f058e 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -3,4 +3,4 @@ virtualenv .venv .venv\Scripts\pipenv install --dev -.venv\Scripts\pipenv run pytest -n auto --boxed -v tests --tap-stream | tee results.tap \ No newline at end of file +.venv\Scripts\pipenv run pytest -v tests --tap-stream | tee results.tap \ No newline at end of file From 447228e00841dd8e23dab1d8e7d309b353bbf1bc Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:27:30 -0500 Subject: [PATCH 24/53] remove tap for now Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index e82f058e..2eb4b3f9 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -3,4 +3,4 @@ virtualenv .venv .venv\Scripts\pipenv install --dev -.venv\Scripts\pipenv run pytest -v tests --tap-stream | tee results.tap \ No newline at end of file +.venv\Scripts\pipenv run pytest -v tests \ No newline at end of file From eefcc66148b6137d643627c9e7ddee947ab87ae9 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:31:34 -0500 Subject: [PATCH 25/53] remove appveyor Signed-off-by: Kenneth Reitz --- _appveyor/install.ps1 | 229 ------------------------------------------ 1 file changed, 229 deletions(-) delete mode 100644 _appveyor/install.ps1 diff --git a/_appveyor/install.ps1 b/_appveyor/install.ps1 deleted file mode 100644 index 160ba55c..00000000 --- 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 From 74546d3405c2ed69f2ed9630ccaf6e0ac282cde9 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:38:26 -0500 Subject: [PATCH 26/53] hack Signed-off-by: Kenneth Reitz --- tests/pytest-pypi/pytest_pypi/app.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/pytest-pypi/pytest_pypi/app.py b/tests/pytest-pypi/pytest_pypi/app.py index efcbe23d..cabe1ba5 100644 --- a/tests/pytest-pypi/pytest_pypi/app.py +++ b/tests/pytest-pypi/pytest_pypi/app.py @@ -9,6 +9,9 @@ app = Flask(__name__) packages = {} +os.path.sep = '/' + + class Package(object): """docstring for Package""" @@ -68,7 +71,7 @@ def serve_package(package, release): for _release in package.releases: if _release.endswith(release): - return send_file(os.path.sep.join([PYPI_VENDOR_DIR, _release.replace('/', os.path.sep)])) + return send_file(os.path.sep.join([PYPI_VENDOR_DIR, _release])) abort(404) From 833093e3612966f51816c007ba055af39b1cd93f Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:41:07 -0500 Subject: [PATCH 27/53] only run windows tests Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- tests/pytest-pypi/pytest_pypi/app.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/run-tests.bat b/run-tests.bat index 2eb4b3f9..91d4fa73 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -3,4 +3,4 @@ virtualenv .venv .venv\Scripts\pipenv install --dev -.venv\Scripts\pipenv run pytest -v tests \ No newline at end of file +.venv\Scripts\pipenv run pytest -v tests -m windows diff --git a/tests/pytest-pypi/pytest_pypi/app.py b/tests/pytest-pypi/pytest_pypi/app.py index cabe1ba5..445e1f96 100644 --- a/tests/pytest-pypi/pytest_pypi/app.py +++ b/tests/pytest-pypi/pytest_pypi/app.py @@ -9,9 +9,6 @@ app = Flask(__name__) packages = {} -os.path.sep = '/' - - class Package(object): """docstring for Package""" From 6a533b5b59198a20886d4014f156f41746e99e49 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:42:32 -0500 Subject: [PATCH 28/53] results.tap Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 91d4fa73..c26819aa 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -3,4 +3,4 @@ virtualenv .venv .venv\Scripts\pipenv install --dev -.venv\Scripts\pipenv run pytest -v tests -m windows +.venv\Scripts\pipenv run pytest -v tests -m windows --tap-stream | tee results.tap From da7cb226dab4f3fa5e0c724154c4aee7826491f7 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:44:46 -0500 Subject: [PATCH 29/53] windows and cli Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index c26819aa..71f021c2 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -3,4 +3,4 @@ virtualenv .venv .venv\Scripts\pipenv install --dev -.venv\Scripts\pipenv run pytest -v tests -m windows --tap-stream | tee results.tap +.venv\Scripts\pipenv run pytest -v tests -m 'windows and cli' --tap-stream | tee results.tap From 67dac4cb06f488e2d383d612ec7d76f9f39c1971 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:46:48 -0500 Subject: [PATCH 30/53] windows and cli Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 71f021c2..613d8124 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -3,4 +3,4 @@ virtualenv .venv .venv\Scripts\pipenv install --dev -.venv\Scripts\pipenv run pytest -v tests -m 'windows and cli' --tap-stream | tee results.tap +.venv\Scripts\pipenv run pytest -v tests -m "windows and cli" --tap-stream | tee results.tap From 8fafb38bc32598419e45fe694de776bcd7111662 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:48:53 -0500 Subject: [PATCH 31/53] windows changes Signed-off-by: Kenneth Reitz --- run-tests.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/run-tests.sh b/run-tests.sh index 7726d9cb..fa4d52c6 100644 --- a/run-tests.sh +++ b/run-tests.sh @@ -21,10 +21,4 @@ if [[ ! -z "$CI" ]]; then pipenv install --dev fi -if [[ ! -z "$WINDOWS" ]]; then - echo "Installing Pipenv…" - pip install -e . --upgrade --upgrade-strategy=only-if-needed - pipenv install --dev -fi - pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream | tee results.tap \ No newline at end of file From 5376ac3e7b1114b495686a51e4502af73cae53c7 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:49:50 -0500 Subject: [PATCH 32/53] windows or cli Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 613d8124..3914ff10 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -3,4 +3,4 @@ virtualenv .venv .venv\Scripts\pipenv install --dev -.venv\Scripts\pipenv run pytest -v tests -m "windows and cli" --tap-stream | tee results.tap +.venv\Scripts\pipenv run pytest -v tests -m "windows or cli" --tap-stream | tee results.tap From 9880bb8fd1b6ba113b2537e4d8a919d72665a0d2 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 13:51:17 -0500 Subject: [PATCH 33/53] empty commit From 15ba4bd2a7ebce91c88131eed4bb275db2b6693b Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:02:48 -0500 Subject: [PATCH 34/53] wow Signed-off-by: Kenneth Reitz --- tests/test_pipenv.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_pipenv.py b/tests/test_pipenv.py index e70e1ee6..a9297703 100644 --- a/tests/test_pipenv.py +++ b/tests/test_pipenv.py @@ -25,6 +25,7 @@ except: os.environ['PIPENV_DONT_USE_PYENV'] = '1' os.environ['PIPENV_IGNORE_VIRTUALENVS'] = '1' +os.environ['PIPENV_VENV_IN_PROJECT'] = '1' os.environ['PYPI_VENDOR_DIR'] = os.path.sep.join([os.path.dirname(__file__), 'pypi']) From 94ea2aa9308cb68cf09c0fd134480c4fe46d0f30 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:08:07 -0500 Subject: [PATCH 35/53] empty commit From 9b89ae198abdbf2324b838b5344c5d4856991eb6 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:09:15 -0500 Subject: [PATCH 36/53] deploy --dev Signed-off-by: Kenneth Reitz --- run-tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run-tests.sh b/run-tests.sh index fa4d52c6..5ed1d075 100644 --- a/run-tests.sh +++ b/run-tests.sh @@ -18,7 +18,7 @@ if [[ ! -z "$CI" ]]; then echo "Installing Pipenv…" pip install -e . --upgrade --upgrade-strategy=only-if-needed - pipenv install --dev + pipenv install --deploy --system --dev fi -pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream | tee results.tap \ No newline at end of file +pipenv run --system time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream | tee results.tap \ No newline at end of file From 99614347884ea53b5ebe1346c6428ffa3cbf8939 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:10:19 -0500 Subject: [PATCH 37/53] results.tap Signed-off-by: Kenneth Reitz --- run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.sh b/run-tests.sh index 5ed1d075..202a306a 100644 --- a/run-tests.sh +++ b/run-tests.sh @@ -21,4 +21,4 @@ if [[ ! -z "$CI" ]]; then pipenv install --deploy --system --dev fi -pipenv run --system time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream | tee results.tap \ No newline at end of file +pipenv run --system time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream > results.tap \ No newline at end of file From d786dfa1bd1d6fc3dd60277c13dd6f1cd84da4ce Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:11:27 -0500 Subject: [PATCH 38/53] fix run-tests.sh Signed-off-by: Kenneth Reitz --- run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.sh b/run-tests.sh index 202a306a..8d189676 100644 --- a/run-tests.sh +++ b/run-tests.sh @@ -21,4 +21,4 @@ if [[ ! -z "$CI" ]]; then pipenv install --deploy --system --dev fi -pipenv run --system time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream > results.tap \ No newline at end of file +pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream > results.tap \ No newline at end of file From 4227c78e6df5d9a128adf25e25f2c2175cc5ed21 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:13:38 -0500 Subject: [PATCH 39/53] oops Signed-off-by: Kenneth Reitz --- run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.sh b/run-tests.sh index 8d189676..00759f1e 100644 --- a/run-tests.sh +++ b/run-tests.sh @@ -21,4 +21,4 @@ if [[ ! -z "$CI" ]]; then pipenv install --deploy --system --dev fi -pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream > results.tap \ No newline at end of file +pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream | tee results.tap \ No newline at end of file From d55b7862229027b21896bc0fd08559c8f64462b1 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:13:48 -0500 Subject: [PATCH 40/53] results.tap Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 3914ff10..9b41f07c 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -3,4 +3,4 @@ virtualenv .venv .venv\Scripts\pipenv install --dev -.venv\Scripts\pipenv run pytest -v tests -m "windows or cli" --tap-stream | tee results.tap +.venv\Scripts\pipenv run pytest -v tests -m "windows or cli" --tap-stream > results.tap From 5c775adb9f653d5608587618e325512389abc96e Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:18:19 -0500 Subject: [PATCH 41/53] don't pipe results of tap Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- run-tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/run-tests.bat b/run-tests.bat index 9b41f07c..45028032 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -3,4 +3,4 @@ virtualenv .venv .venv\Scripts\pipenv install --dev -.venv\Scripts\pipenv run pytest -v tests -m "windows or cli" --tap-stream > results.tap +.venv\Scripts\pipenv run pytest -v tests -m "windows or cli" --tap-stream diff --git a/run-tests.sh b/run-tests.sh index 00759f1e..9a21c9e5 100644 --- a/run-tests.sh +++ b/run-tests.sh @@ -21,4 +21,4 @@ if [[ ! -z "$CI" ]]; then pipenv install --deploy --system --dev fi -pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream | tee results.tap \ No newline at end of file +pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream \ No newline at end of file From 2cc55447d5cbdaf99886839536efe444e2bb41b4 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:23:31 -0500 Subject: [PATCH 42/53] remove completion test Signed-off-by: Kenneth Reitz --- tests/test_pipenv.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/test_pipenv.py b/tests/test_pipenv.py index a9297703..52843681 100644 --- a/tests/test_pipenv.py +++ b/tests/test_pipenv.py @@ -194,11 +194,6 @@ class TestPipenv: with PipenvInstance() as p: assert p.pipenv('--help').out - @pytest.mark.cli - def test_completion(self): - with PipenvInstance() as p: - assert p.pipenv('--completion').out - @pytest.mark.cli def test_man(self): with PipenvInstance() as p: From bfdf7d51fec2c89b399169cba92d71a60eb87ecc Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:27:26 -0500 Subject: [PATCH 43/53] set pypi directory Signed-off-by: Kenneth Reitz --- run-tests.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/run-tests.bat b/run-tests.bat index 45028032..08b1646a 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -2,5 +2,6 @@ virtualenv .venv .venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed .venv\Scripts\pipenv install --dev +SET PYPI_VENDOR_DIR '.\tests\pypi\' .venv\Scripts\pipenv run pytest -v tests -m "windows or cli" --tap-stream From e070d04602c36e2d8b76480d254e416b6fc7b1f1 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:28:31 -0500 Subject: [PATCH 44/53] proper quotes Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 08b1646a..deabf609 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -2,6 +2,6 @@ virtualenv .venv .venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed .venv\Scripts\pipenv install --dev -SET PYPI_VENDOR_DIR '.\tests\pypi\' +SET PYPI_VENDOR_DIR ".\tests\pypi\" .venv\Scripts\pipenv run pytest -v tests -m "windows or cli" --tap-stream From 2fb49024588592c998497307c9f566793199d6ba Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:30:24 -0500 Subject: [PATCH 45/53] try this Signed-off-by: Kenneth Reitz --- run-tests.bat | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/run-tests.bat b/run-tests.bat index deabf609..e24c7330 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -2,6 +2,4 @@ virtualenv .venv .venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed .venv\Scripts\pipenv install --dev -SET PYPI_VENDOR_DIR ".\tests\pypi\" - -.venv\Scripts\pipenv run pytest -v tests -m "windows or cli" --tap-stream +SET PYPI_VENDOR_DIR=".\tests\pypi\" && .venv\Scripts\pipenv run pytest -v tests -m "windows or cli" --tap-stream From 64b03bcde0b83271c6a01bd467da917836225198 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:34:25 -0500 Subject: [PATCH 46/53] test --- .env | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 00000000..189ddda7 --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +HELLO=WORLD +PYPI_VENDOR_DIR="./tests/pypi/" \ No newline at end of file From 8264b762f6b649b7ccf7fd422e99027973e7448e Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:36:22 -0500 Subject: [PATCH 47/53] cleanup Signed-off-by: Kenneth Reitz --- tests/pytest-pypi/pytest_pypi/app.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/pytest-pypi/pytest_pypi/app.py b/tests/pytest-pypi/pytest_pypi/app.py index 445e1f96..7c2c8288 100644 --- a/tests/pytest-pypi/pytest_pypi/app.py +++ b/tests/pytest-pypi/pytest_pypi/app.py @@ -33,7 +33,6 @@ class Package(object): def prepare_packages(path=PYPI_VENDOR_DIR): - print(os.path.abspath(PYPI_VENDOR_DIR)) for root, dirs, files in os.walk(os.path.abspath(PYPI_VENDOR_DIR)): for file in files: if not file.startswith('.'): From 6b1c688c16ff6513b153fd44fb327307541cf452 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:36:56 -0500 Subject: [PATCH 48/53] cleanup Signed-off-by: Kenneth Reitz --- tests/pytest-pypi/pytest_pypi/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pytest-pypi/pytest_pypi/app.py b/tests/pytest-pypi/pytest_pypi/app.py index 7c2c8288..83f82200 100644 --- a/tests/pytest-pypi/pytest_pypi/app.py +++ b/tests/pytest-pypi/pytest_pypi/app.py @@ -32,7 +32,7 @@ class Package(object): self._releases.append(path_to_binary) -def prepare_packages(path=PYPI_VENDOR_DIR): +def prepare_packages(): for root, dirs, files in os.walk(os.path.abspath(PYPI_VENDOR_DIR)): for file in files: if not file.startswith('.'): From bbd5a7fd4714cd6eb30e1d1c04e6704c4be71c6d Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:38:32 -0500 Subject: [PATCH 49/53] cleanup Signed-off-by: Kenneth Reitz --- tests/pytest-pypi/pytest_pypi/app.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/pytest-pypi/pytest_pypi/app.py b/tests/pytest-pypi/pytest_pypi/app.py index 83f82200..e8d9431f 100644 --- a/tests/pytest-pypi/pytest_pypi/app.py +++ b/tests/pytest-pypi/pytest_pypi/app.py @@ -43,16 +43,20 @@ def prepare_packages(): packages[package_name].add_release(os.path.sep.join([root, file])) + prepare_packages() + @app.route('/') def hello_world(): return redirect('/simple', code=302) + @app.route('/simple') def simple(): return render_template('simple.html', packages=packages.values()) + @app.route('/simple//') def simple_package(package): if package in packages: @@ -60,6 +64,7 @@ def simple_package(package): else: abort(404) + @app.route('//') def serve_package(package, release): if package in packages: @@ -71,5 +76,6 @@ def serve_package(package, release): abort(404) + if __name__ == '__main__': - app.run() \ No newline at end of file + app.run() From 11b5952f9a4df90f2fa079041b5e2c996e8151b5 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:42:50 -0500 Subject: [PATCH 50/53] fix Signed-off-by: Kenneth Reitz --- tests/pytest-pypi/pytest_pypi/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pytest-pypi/pytest_pypi/app.py b/tests/pytest-pypi/pytest_pypi/app.py index e8d9431f..18f35102 100644 --- a/tests/pytest-pypi/pytest_pypi/app.py +++ b/tests/pytest-pypi/pytest_pypi/app.py @@ -21,7 +21,7 @@ class Package(object): def releases(self): r = [] for release in self._releases: - release = release[len(PYPI_VENDOR_DIR):] + release = release[len(PYPI_VENDOR_DIR):].replace('\\', '/') r.append(release) return r From 6f7024196dfa2a7f7fee219d7c0c1ed62836bdc4 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:46:26 -0500 Subject: [PATCH 51/53] run all tests on windows Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index e24c7330..633f461d 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -2,4 +2,4 @@ virtualenv .venv .venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed .venv\Scripts\pipenv install --dev -SET PYPI_VENDOR_DIR=".\tests\pypi\" && .venv\Scripts\pipenv run pytest -v tests -m "windows or cli" --tap-stream +SET PYPI_VENDOR_DIR=".\tests\pypi\" && .venv\Scripts\pipenv run pytest -v tests --tap-stream From 24edcc8ee8c80c324fae1f97aec7aa5605e385dd Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:46:46 -0500 Subject: [PATCH 52/53] try concurrency again Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 633f461d..0f4c34e4 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -2,4 +2,4 @@ virtualenv .venv .venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed .venv\Scripts\pipenv install --dev -SET PYPI_VENDOR_DIR=".\tests\pypi\" && .venv\Scripts\pipenv run pytest -v tests --tap-stream +SET PYPI_VENDOR_DIR=".\tests\pypi\" && .venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream From 29009dc3520f49562f8c52bebde198c951192d3d Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:54:42 -0500 Subject: [PATCH 53/53] no appveyor Signed-off-by: Kenneth Reitz --- appveyor.yml | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index c17c9150..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,51 +0,0 @@ -# AppVeyor.yml from https://github.com/ogrisel/python-appveyor-demo -# License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/ - -build: off - -environment: - - # Create expected SHELL variable for pipenv. - SHELL: "windows" - - matrix: - - - PYTHON: "C:\\Python27-x64" - PYTHON_VERSION: "2.7.x" - PYTHON_ARCH: "64" - - - PYTHON: "C:\\Python34-x64" - PYTHON_VERSION: "3.4.x" - PYTHON_ARCH: "64" - - - PYTHON: "C:\\Python35-x64" - PYTHON_VERSION: "3.5.x" - PYTHON_ARCH: "64" - - - PYTHON: "C:\\Python36-x64" - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "64" - -install: - # 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 } - - # 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%" - - "SET PYTHONIOENCODING=utf-8" - - # 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. - - "pip install --disable-pip-version-check --user --upgrade pip" - - "pip install -e . --upgrade" - - "pipenv install --system --dev --skip-lock" - -test_script: - - "pipenv run pytest -n 8 tests/test_pipenv.py tests/test_project.py tests/test_utils.py"