diff --git a/CHANGELOG.md b/CHANGELOG.md index acde55e..1e51962 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ # Unreleased +- Update pip from 20.0.2 to 20.1.1 for Python 2.7 and Python 3.5+ (#1030). - Update setuptools from 39.0.1 to: (#1024) - 44.1.1 for Python 2.7 - 43.0.0 for Python 3.4 diff --git a/bin/compile b/bin/compile index 9a0a2d6..40369cc 100755 --- a/bin/compile +++ b/bin/compile @@ -137,6 +137,10 @@ export LIBRARY_PATH=/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LIBRARY_PAT export LD_LIBRARY_PATH=/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LD_LIBRARY_PATH export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:/app/.heroku/python/lib/pkg-config:$PKG_CONFIG_PATH +# Global pip options (https://pip.pypa.io/en/stable/user_guide/#environment-variables). +# Disable pip's warnings about EOL Python since we show our own. +export PIP_NO_PYTHON_VERSION_WARNING=1 + # The Application Code # -------------------- diff --git a/bin/steps/python b/bin/steps/python index 71406dd..e95b7fc 100755 --- a/bin/steps/python +++ b/bin/steps/python @@ -137,7 +137,7 @@ fi set -e -PIP_VERSION='20.0.2' +PIP_VERSION='20.1.1' # Must use setuptools <47.2.0 until we fix: # https://github.com/heroku/heroku-buildpack-python/issues/1006 SETUPTOOLS_VERSION='47.1.1' diff --git a/test/run-features b/test/run-features index 69080e3..fb30eb8 100755 --- a/test/run-features +++ b/test/run-features @@ -108,6 +108,7 @@ testHooks() { LIBRARY_PATH OLDPWD PATH + PIP_NO_PYTHON_VERSION_WARNING PKG_CONFIG_PATH PROFILE_PATH PWD diff --git a/test/run-versions b/test/run-versions index a6b6186..c491748 100755 --- a/test/run-versions +++ b/test/run-versions @@ -9,7 +9,7 @@ testPythonDefault() { compile "pythonDefault" assertCaptured $DEFAULT_PYTHON_VERSION assertNotCaptured "security update" - assertCaptured "Installing pip 20.0.2, setuptools 47.1.1 and wheel 0.34.2" + assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2" assertCaptured "Installing SQLite3" assertCapturedSuccess } @@ -25,7 +25,7 @@ testPython2() { assertNotCaptured "python-2-7-eol-faq"; fi assertNotCaptured "security update" - assertCaptured "Installing pip 20.0.2, setuptools 44.1.1 and wheel 0.34.2" + assertCaptured "Installing pip 20.1.1, setuptools 44.1.1 and wheel 0.34.2" assertCaptured "Installing SQLite3" assertCapturedSuccess } @@ -89,7 +89,7 @@ testPython3_5() { compile "python3_5" assertCaptured $LATEST_35 assertNotCaptured "security update" - assertCaptured "Installing pip 20.0.2, setuptools 47.1.1 and wheel 0.34.2" + assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2" assertCaptured "Installing SQLite3" assertCapturedSuccess } @@ -112,7 +112,7 @@ testPython3_6() { compile "python3_6" assertCaptured $LATEST_36 assertNotCaptured "security update" - assertCaptured "Installing pip 20.0.2, setuptools 47.1.1 and wheel 0.34.2" + assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2" assertCaptured "Installing SQLite3" assertCapturedSuccess } @@ -139,7 +139,7 @@ testPython3_7() { else assertNotCaptured "security update" assertCaptured $LATEST_37 - assertCaptured "Installing pip 20.0.2, setuptools 47.1.1 and wheel 0.34.2" + assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2" assertCaptured "Installing SQLite3" assertCapturedSuccess fi @@ -183,7 +183,7 @@ testPython3_8() { else assertNotCaptured "security update" assertCaptured $LATEST_38 - assertCaptured "Installing pip 20.0.2, setuptools 47.1.1 and wheel 0.34.2" + assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2" assertCaptured "Installing SQLite3" assertCapturedSuccess fi @@ -202,7 +202,7 @@ testPypy3_6() { else assertCaptured "Installing pypy" assertCaptured "$PYPY_36" - assertCaptured "Installing pip 20.0.2, setuptools 47.1.1 and wheel 0.34.2" + assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2" assertCapturedSuccess fi } @@ -214,7 +214,7 @@ testPypy2_7() { else assertCaptured "Installing pypy" assertCaptured "$PYPY_27" - assertCaptured "Installing pip 20.0.2, setuptools 44.1.1 and wheel 0.34.2" + assertCaptured "Installing pip 20.1.1, setuptools 44.1.1 and wheel 0.34.2" assertCapturedSuccess fi }