From c44b1f98e7c3f82f938261dd265abeea1855e705 Mon Sep 17 00:00:00 2001 From: Vitya Alexandrov Date: Thu, 8 Oct 2020 08:54:09 -0700 Subject: [PATCH 1/3] manual override of pip version for pipenv users (PR) Allow for a manual override of pip version for pipenv users (PR) https://github.com/heroku/heroku-buildpack-python/issues/1093 --- bin/steps/python | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/steps/python b/bin/steps/python index 45d34e6eb..e7d29f92e 100755 --- a/bin/steps/python +++ b/bin/steps/python @@ -179,7 +179,12 @@ if [[ -f "$BUILD_DIR/Pipfile" ]]; then # The buildpack is pinned to old pipenv, which requires older pip. # Pip 9.0.2 doesn't support installing itself from a wheel, so we have to use split # versions here (ie: installer pip version different from target pip version). - PIP_VERSION='9.0.2' + if [ -z "$PIP_VERSION_OVERRIDE" ] + then + PIP_VERSION='9.0.2' + else + PIP_VERSION=PIP_VERSION_OVERRIDE + fi PIP_TO_INSTALL="pip==${PIP_VERSION}" else PIP_TO_INSTALL="${PIP_WHEEL}" From 83df26e996ca49d230eaff7aee544c4f3b6f90d5 Mon Sep 17 00:00:00 2001 From: Vitya Alexandrov Date: Thu, 8 Oct 2020 09:01:01 -0700 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5b4b0dbd..d04657256 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased - Add support for Heroku-20 (#968). +- allow pipenv users to specify pip version via `PIP_VERSION_OVERRIDE` variable (#1094) ## v182 (2020-10-06) From abb9394a65316388554f6cfd2bfa3834cd40ec6b Mon Sep 17 00:00:00 2001 From: Vitya Alexandrov Date: Thu, 8 Oct 2020 09:02:13 -0700 Subject: [PATCH 3/3] style formatting --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d04657256..f029b4cab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Add support for Heroku-20 (#968). -- allow pipenv users to specify pip version via `PIP_VERSION_OVERRIDE` variable (#1094) +- Allow pipenv users to specify pip version via `PIP_VERSION_OVERRIDE` variable (#1094) ## v182 (2020-10-06)