From bb7ea4bf4109aab6c9f8acc8e4ea76223aa198e2 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Thu, 14 Jun 2018 01:32:08 -0400 Subject: [PATCH 01/10] Try new appveyor config - Auto abort re-built PRs - Better leverage of caching - Better exit handling Signed-off-by: Dan Ryan Fix appveyor config Signed-off-by: Dan Ryan Fix syntax error Signed-off-by: Dan Ryan Try tox with detox Signed-off-by: Dan Ryan Slight tweak? Signed-off-by: Dan Ryan Back to powershell Signed-off-by: Dan Ryan --- appveyor.yml | 99 +++++++++++++++++++++++++++++++++------------------- tox.ini | 16 +++++++++ 2 files changed, 79 insertions(+), 36 deletions(-) create mode 100644 tox.ini diff --git a/appveyor.yml b/appveyor.yml index 281be9157d..2a172f02ab 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,54 +4,81 @@ version: 1.0.{build} skip_branch_with_pr: true init: +- ps: >- - - git config --global core.sharedRepository true - - git config --global core.longpaths true - - git config --global core.autocrlf input + git config --global core.sharedRepository true + + git config --global core.longpaths true + + git config --global core.autocrlf input + + if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod ` + https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | ` + Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` + Write-Host "There are newer queued builds for this pull request, skipping build." + Exit-AppveyorBuild + } + + If (($env:SKIP_NOTAG -eq "true") -and ($env:APPVEYOR_REPO_TAG -ne "true")) { + Write-Host "Skipping build, not at a tag." + Exit-AppveyorBuild + } environment: - PYPI_VENDOR_DIR: '.\tests\pypi\' - GIT_ASK_YESNO: 'false' - SHELL: 'windows' - PYTHON_ARCH: '64' - PYTHONIOENCODING: 'utf-8' + PYPI_VENDOR_DIR: .\tests\pypi\ + PYTHONIOENCODING: utf-8 + GIT_ASK_YESNO: false + SHELL: windows + PYTHON_ARCH: 64 + APPVEYOR_SAVE_CACHE_ON_ERROR: true + APPVEYOR_SKIP_FINALIZE_ON_EXIT: true matrix: - - PYTHON: 'C:\Python27-x64' - PYTHON_VERSION: '2.7.x' - TEST_SUITE: 'not install' - - - PYTHON: 'C:\Python27-x64' - PYTHON_VERSION: '2.7.x' - TEST_SUITE: 'install' - PYTEST_ADDOPTS: '--cache-clear' - RUN_INTEGRATION_TESTS: 'True' + - PYTHON: C:\Python27-x64 + PYTHON_VERSION: 2.7.x + PIPENV_PYTHON: 2.7 - - PYTHON: 'C:\Python36-x64' - PYTHON_VERSION: '3.6.x' - TEST_SUITE: 'not install' + - PYTHON: C:\Python36-x64 + PYTHON_VERSION: 3.6.x + PIPENV_PYTHON: 3.6 - - PYTHON: 'C:\Python36-x64' - PYTHON_VERSION: '3.6.x' - TEST_SUITE: 'install' - PYTEST_ADDOPTS: '--cache-clear' - RUN_INTEGRATION_TESTS: 'True' install: - - 'set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%' - - '%PYTHON%\python.exe -m pip install --upgrade pip' - - '%PYTHON%\python.exe -m pip install -e .' - - '%PYTHON%\python.exe -m pipenv run pip install -e .' - - '%PYTHON%\python.exe -m pipenv install --dev' - - '%PYTHON%\python.exe -m pipenv --venv' - - '%PYTHON%\python.exe -m pipenv --py' - - '%PYTHON%\python.exe -m pipenv run python --version' +- ps: >- + + $script_path = Join-Path -path $env:PYTHON -childpath Scripts + + $py_exe = Join-Path -path $env:PYTHON -childpath python.exe + + $pipenv_exe = Join-Path -path $script_path -childpath pipenv.exe + + $env:PATH = "$py_path;$script_path;$env:PATH" + + Invoke-Expression "$py_exe -m pip install --upgrade pip" + + Invoke-Expression "$py_exe -m pip install -e ." + + Invoke-Expression "$pipenv_exe install --dev" + + Invoke-Expression "$pipenv_exe --venv" + + Invoke-Expression "$pipenv_exe --py" cache: - - '%LocalAppData%\pip\cache' +- '%LocalAppData%\pip\cache' +- '%LocalAppData%\pipenv\cache' test_script: - - 'if "%RUN_INTEGRATION_TESTS%" == "True" (rmdir /s /q %LocalAppData%\pip\cache)' - - '%PYTHON%\python.exe -m pipenv run pytest -v -n 4 -m "%TEST_SUITE%" tests' + +- ps: >- + $script_path = Join-Path -path $env:PYTHON -childpath Scripts + + $py_exe = Join-Path -path $env:PYTHON -childpath python.exe + + $pipenv_exe = Join-Path -path $script_path -childpath pipenv.exe + + $env:PATH = "$py_path;$script_path;$env:PATH" + + Invoke-Expression "$pipenv_exe run pytest -v -n 4 --ignore=pipenv\patched --ignore=pipenv\vendor tests" diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000000..e0f660e0fc --- /dev/null +++ b/tox.ini @@ -0,0 +1,16 @@ +[tox] +envlist = 2.7, + 3.6 + +[testenv] +setenv = PYPI_VENDOR_DIR = {toxinidir}/tests/pypi/ + PIPENV_PYTHON = {envname} + PYTHONIOENCODING = utf-8 + PIPENV_IGNORE_VIRTUALENVS = 1 +passenv = http_proxy https_proxy no_proxy SSL_CERT_FILE TOXENV CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_* CODECOV_* PIPENV_* PIP_* TEST_SUITE PYTHONIOENCODING GIT_ASK_YESNO SHELL PYTHON_ARCH +deps = -e . + pytest +basepython = python{envname} +commands = python -m pip install -e . + python -m pipenv install --dev + pipenv run pytest {posargs:-v -n 4 --ignore="{toxinidir}/pipenv/patched" --ignore="{toxinidir}/pipenv/vendor" -m "{env:TEST_SUITE}" tests} From 6a15ee24560b37f2a09a26f84b6dc4dbd43d635d Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Tue, 26 Jun 2018 18:42:39 -0400 Subject: [PATCH 02/10] Test updates Signed-off-by: Dan Ryan --- appveyor.yml | 62 +++++++++++++++++++++++++++++++++++++++------------- run-tests.sh | 7 ++++++ 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2a172f02ab..f07cea2363 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,36 +13,66 @@ init: git config --global core.autocrlf input if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod ` + https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | ` + Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` + Write-Host "There are newer queued builds for this pull request, skipping build." + Exit-AppveyorBuild + } If (($env:SKIP_NOTAG -eq "true") -and ($env:APPVEYOR_REPO_TAG -ne "true")) { + Write-Host "Skipping build, not at a tag." + Exit-AppveyorBuild + } + environment: - PYPI_VENDOR_DIR: .\tests\pypi\ - PYTHONIOENCODING: utf-8 - GIT_ASK_YESNO: false - SHELL: windows - PYTHON_ARCH: 64 - APPVEYOR_SAVE_CACHE_ON_ERROR: true - APPVEYOR_SKIP_FINALIZE_ON_EXIT: true + PYPI_VENDOR_DIR: '.\tests\pypi\' + GIT_ASK_YESNO: 'false' + SHELL: 'windows' + PYTHON_ARCH: '64' + PYTHONIOENCODING: 'utf-8' matrix: - - PYTHON: C:\Python27-x64 - PYTHON_VERSION: 2.7.x - PIPENV_PYTHON: 2.7 + - PYTHON: 'C:\Python27-x64' + PYTHON_VERSION: '2.7.x' + TEST_SUITE: 'not install' + + - PYTHON: 'C:\Python27-x64' + PYTHON_VERSION: '2.7.x' + TEST_SUITE: 'install' + PYTEST_ADDOPTS: '--cache-clear' + RUN_INTEGRATION_TESTS: 'True' + + - PYTHON: 'C:\Python36-x64' + PYTHON_VERSION: '3.6.x' + TEST_SUITE: 'not install' + + - PYTHON: 'C:\Python36-x64' + PYTHON_VERSION: '3.6.x' + TEST_SUITE: 'install' + PYTEST_ADDOPTS: '--cache-clear' + RUN_INTEGRATION_TESTS: 'True' + + - PYTHON: 'C:\Python37-x64' + PYTHON_VERSION: '3.7.x' + TEST_SUITE: 'not install' + + - PYTHON: 'C:\Python37-x64' + PYTHON_VERSION: '3.7.x' + TEST_SUITE: 'install' + PYTEST_ADDOPTS: '--cache-clear' + RUN_INTEGRATION_TESTS: 'True' - - PYTHON: C:\Python36-x64 - PYTHON_VERSION: 3.6.x - PIPENV_PYTHON: 3.6 install: @@ -56,7 +86,7 @@ install: $env:PATH = "$py_path;$script_path;$env:PATH" - Invoke-Expression "$py_exe -m pip install --upgrade pip" + Invoke-Expression "$py_exe -m pip install --upgrade pip invoke" Invoke-Expression "$py_exe -m pip install -e ." @@ -81,4 +111,6 @@ test_script: $env:PATH = "$py_path;$script_path;$env:PATH" - Invoke-Expression "$pipenv_exe run pytest -v -n 4 --ignore=pipenv\patched --ignore=pipenv\vendor tests" + If (($env:RUN_INTEGRATION_TESTS -eq "True") -and ($env:PYTHON_VERSION -eq "3.6.x")) { Invoke-Expression "invoke vendoring.update" } + + Invoke-Expression "$pipenv_exe run pytest -v -n 4 --ignore=pipenv\patched --ignore=pipenv\vendor -m $env:TEST_SUITE tests" diff --git a/run-tests.sh b/run-tests.sh index a705932209..3f3ca7a06b 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -41,8 +41,10 @@ fi echo "Installing dependencies…" PIPENV_PYTHON=2.7 pipenv run pip install -e . --upgrade PIPENV_PYTHON=3.6 pipenv run pip install -e . --upgrade +PIPENV_PYTHON=3.7 pipenv run pip install -e . --upgrade PIPENV_PYTHON=2.7 pipenv install --dev PIPENV_PYTHON=3.6 pipenv install --dev +PIPENV_PYTHON=3.7 pipenv install --dev echo "$ pipenv run time pytest -v -n auto tests -m \"$TEST_SUITE\"" # PIPENV_PYTHON=2.7 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" | prefix 2.7 & @@ -50,5 +52,10 @@ echo "$ pipenv run time pytest -v -n auto tests -m \"$TEST_SUITE\"" # Better to run them sequentially. PIPENV_PYTHON=2.7 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" PIPENV_PYTHON=3.6 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" +PIPENV_PYTHON=3.7 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" + +# test revendoring +pip install --upgrade invoke +inv vendoring.update # Cleanup junk. rm -fr .venv From d2dbbf436323d5370a895997c60bf71a87ff49b2 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Tue, 26 Jun 2018 18:46:53 -0400 Subject: [PATCH 03/10] Update vendoring scripts - Update appveyor script to respect PR updates - Add vendoring script to CI - Closes #2428 --- appveyor.yml | 11 ++--------- pipenv/vendor/vendor.txt | 2 +- run-tests.sh | 7 ++----- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f07cea2363..ed18930eea 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,5 @@ build: off version: 1.0.{build} - skip_branch_with_pr: true init: @@ -13,23 +12,15 @@ init: git config --global core.autocrlf input if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod ` - https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | ` - Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` - Write-Host "There are newer queued builds for this pull request, skipping build." - Exit-AppveyorBuild - } If (($env:SKIP_NOTAG -eq "true") -and ($env:APPVEYOR_REPO_TAG -ne "true")) { - Write-Host "Skipping build, not at a tag." - Exit-AppveyorBuild - } @@ -37,6 +28,8 @@ environment: PYPI_VENDOR_DIR: '.\tests\pypi\' GIT_ASK_YESNO: 'false' + APPVEYOR_SAVE_CACHE_ON_ERROR: 'true' + APPVEYOR_SKIP_FINALIZE_ON_EXIT: 'true' SHELL: 'windows' PYTHON_ARCH: '64' PYTHONIOENCODING: 'utf-8' diff --git a/pipenv/vendor/vendor.txt b/pipenv/vendor/vendor.txt index e95b517840..8ecc6ba5f3 100644 --- a/pipenv/vendor/vendor.txt +++ b/pipenv/vendor/vendor.txt @@ -34,7 +34,7 @@ requirementslib==1.0.7 pyparsing==2.2.0 pytoml==0.1.16 requirements-parser==0.2.0 -shellingham==1.1.0dev0 +shellingham==1.1.0 six==1.11.0 semver==2.8.0 shutilwhich==1.1.0 diff --git a/run-tests.sh b/run-tests.sh index 3f3ca7a06b..9a6db97f53 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -41,10 +41,8 @@ fi echo "Installing dependencies…" PIPENV_PYTHON=2.7 pipenv run pip install -e . --upgrade PIPENV_PYTHON=3.6 pipenv run pip install -e . --upgrade -PIPENV_PYTHON=3.7 pipenv run pip install -e . --upgrade PIPENV_PYTHON=2.7 pipenv install --dev PIPENV_PYTHON=3.6 pipenv install --dev -PIPENV_PYTHON=3.7 pipenv install --dev echo "$ pipenv run time pytest -v -n auto tests -m \"$TEST_SUITE\"" # PIPENV_PYTHON=2.7 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" | prefix 2.7 & @@ -52,10 +50,9 @@ echo "$ pipenv run time pytest -v -n auto tests -m \"$TEST_SUITE\"" # Better to run them sequentially. PIPENV_PYTHON=2.7 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" PIPENV_PYTHON=3.6 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" -PIPENV_PYTHON=3.7 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" # test revendoring -pip install --upgrade invoke -inv vendoring.update +pip3 install --upgrade invoke requests parver +python3 -m invoke vendoring.update # Cleanup junk. rm -fr .venv From cf838f2824f510b08405cc37f0a15c9f2b1bfc3e Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Thu, 28 Jun 2018 00:08:58 -0400 Subject: [PATCH 04/10] Update appveyor script Signed-off-by: Dan Ryan --- appveyor.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ed18930eea..f8cf4f6f44 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,7 +35,6 @@ environment: PYTHONIOENCODING: 'utf-8' matrix: - - PYTHON: 'C:\Python27-x64' PYTHON_VERSION: '2.7.x' TEST_SUITE: 'not install' @@ -66,8 +65,6 @@ environment: PYTEST_ADDOPTS: '--cache-clear' RUN_INTEGRATION_TESTS: 'True' - - install: - ps: >- @@ -104,6 +101,14 @@ test_script: $env:PATH = "$py_path;$script_path;$env:PATH" - If (($env:RUN_INTEGRATION_TESTS -eq "True") -and ($env:PYTHON_VERSION -eq "3.6.x")) { Invoke-Expression "invoke vendoring.update" } + $invoke_path = Join-Path -path $script_path -childpath invoke.exe + + Invoke-Expression "$pipenv_exe run pytest -v -n 4 --ignore=pipenv\patched --ignore=pipenv\vendor -m `"$env:TEST_SUITE`" tests" + + If ($env:RUN_INTEGRATION_TESTS -and ($env:PYTHON_VERSION -eq "3.6.x")) { + + Invoke-Expression "$py_exe -m pip install invoke" + + Invoke-Expression "$invoke_path vendoring.update" - Invoke-Expression "$pipenv_exe run pytest -v -n 4 --ignore=pipenv\patched --ignore=pipenv\vendor -m $env:TEST_SUITE tests" + } From b0c14186893100e0f2e43c8d9c9b2d45e4016fe5 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Thu, 28 Jun 2018 01:33:14 -0400 Subject: [PATCH 05/10] Final tweak I believe. Signed-off-by: Dan Ryan --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f8cf4f6f44..c67a8cfb67 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -107,7 +107,7 @@ test_script: If ($env:RUN_INTEGRATION_TESTS -and ($env:PYTHON_VERSION -eq "3.6.x")) { - Invoke-Expression "$py_exe -m pip install invoke" + Invoke-Expression "$py_exe -m pip install invoke parver" Invoke-Expression "$invoke_path vendoring.update" From 29766fa0ce2053e5bdd8e7257798a192cbfc7468 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Thu, 28 Jun 2018 18:14:18 -0400 Subject: [PATCH 06/10] Fix test Signed-off-by: Dan Ryan --- tests/integration/test_pipenv.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/integration/test_pipenv.py b/tests/integration/test_pipenv.py index 89ee793ebb..22374254ef 100644 --- a/tests/integration/test_pipenv.py +++ b/tests/integration/test_pipenv.py @@ -3,12 +3,13 @@ XXX: Try our best to reduce tests in this file. """ import os -from tempfile import gettempdir, mkdtemp +from tempfile import mkdtemp import mock import pytest from pipenv.core import activate_virtualenv +from pipenv.utils import temp_environ from pipenv.project import Project from pipenv.vendor import delegator from pipenv._compat import Path @@ -103,14 +104,11 @@ def test_proper_names_unamanged_virtualenv(PipenvInstance, pypi): def test_directory_with_leading_dash(PipenvInstance): def mocked_mkdtemp(suffix, prefix, dir): if suffix == '-project': - temp_dir = Path(gettempdir()) / '-dir-with-leading-dash' - temp_dir.mkdir() - return str(temp_dir) - else: - return mkdtemp(suffix, prefix, dir) + prefix = '-dir-with-leading-dash' + return mkdtemp(suffix, prefix, dir) with mock.patch('pipenv._compat.mkdtemp', side_effect=mocked_mkdtemp): - with PipenvInstance(chdir=True) as p: + with temp_environ(), PipenvInstance(chdir=True) as p: # This environment variable is set in the context manager and will # cause pipenv to use virtualenv, not pew. del os.environ['PIPENV_VENV_IN_PROJECT'] From a0f2d7ed5def90745648c90f9acea2792d693d81 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Thu, 28 Jun 2018 20:51:15 -0400 Subject: [PATCH 07/10] Remove tox.ini Signed-off-by: Dan Ryan --- tox.ini | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 tox.ini diff --git a/tox.ini b/tox.ini deleted file mode 100644 index e0f660e0fc..0000000000 --- a/tox.ini +++ /dev/null @@ -1,16 +0,0 @@ -[tox] -envlist = 2.7, - 3.6 - -[testenv] -setenv = PYPI_VENDOR_DIR = {toxinidir}/tests/pypi/ - PIPENV_PYTHON = {envname} - PYTHONIOENCODING = utf-8 - PIPENV_IGNORE_VIRTUALENVS = 1 -passenv = http_proxy https_proxy no_proxy SSL_CERT_FILE TOXENV CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_* CODECOV_* PIPENV_* PIP_* TEST_SUITE PYTHONIOENCODING GIT_ASK_YESNO SHELL PYTHON_ARCH -deps = -e . - pytest -basepython = python{envname} -commands = python -m pip install -e . - python -m pipenv install --dev - pipenv run pytest {posargs:-v -n 4 --ignore="{toxinidir}/pipenv/patched" --ignore="{toxinidir}/pipenv/vendor" -m "{env:TEST_SUITE}" tests} From 511d0dd2934bb49ab996b6b64bfdaad359f078ca Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Thu, 28 Jun 2018 21:17:26 -0400 Subject: [PATCH 08/10] Fix buildkite Signed-off-by: Dan Ryan --- run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.sh b/run-tests.sh index 9a6db97f53..002587c504 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -20,7 +20,7 @@ fi export PATH="~/.local/bin:$PATH" echo "Installing Pipenv…" -pip install -e "$(pwd)" --upgrade +pip install --user -e "$(pwd)" --upgrade pipenv install --deploy --dev # Otherwise, we're on a development machine. From 95e932e66894c8feef89711ceab6fbbefc0df044 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Thu, 28 Jun 2018 21:21:37 -0400 Subject: [PATCH 09/10] update buildkite Signed-off-by: Dan Ryan --- run-tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run-tests.sh b/run-tests.sh index 002587c504..aff35e496d 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -19,8 +19,9 @@ if [[ ! -z "$TEST_SUITE" ]]; then fi export PATH="~/.local/bin:$PATH" +pip uninstall pipenv echo "Installing Pipenv…" -pip install --user -e "$(pwd)" --upgrade +pip install -e "$(pwd)" --upgrade pipenv install --deploy --dev # Otherwise, we're on a development machine. From 4b8d9ffd3336ffd7601c16d37d5fa318d975bec8 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Fri, 29 Jun 2018 12:45:14 -0400 Subject: [PATCH 10/10] Pass `-y` to pip uninstall for buildkite Signed-off-by: Dan Ryan --- run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.sh b/run-tests.sh index aff35e496d..ce62ea5ad9 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -19,7 +19,7 @@ if [[ ! -z "$TEST_SUITE" ]]; then fi export PATH="~/.local/bin:$PATH" -pip uninstall pipenv +pip uninstall -y pipenv echo "Installing Pipenv…" pip install -e "$(pwd)" --upgrade pipenv install --deploy --dev