diff --git a/CHANGELOG.md b/CHANGELOG.md index d57b2640e..796fe479d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased +- Update pip from 20.1.1 to 20.2.4 for Python 2.7 and Python 3.5+ ([#1192](https://github.com/heroku/heroku-buildpack-python/pull/1192)). - Update wheel from 0.34.2 to 0.36.2 for Python 2.7 and Python 3.5+ ([#1191](https://github.com/heroku/heroku-buildpack-python/pull/1191)). - Support build environments where `$BUILD_DIR` is set to a symlink of `/app` ([#992](https://github.com/heroku/heroku-buildpack-python/pull/992)). diff --git a/bin/steps/python b/bin/steps/python index 50d7e7dcc..cde55ff19 100755 --- a/bin/steps/python +++ b/bin/steps/python @@ -142,7 +142,7 @@ fi set -e -PIP_VERSION='20.1.1' +PIP_VERSION='20.2.4' # 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/spec/hatchet/pip_spec.rb b/spec/hatchet/pip_spec.rb index d73fbda70..b95e64274 100644 --- a/spec/hatchet/pip_spec.rb +++ b/spec/hatchet/pip_spec.rb @@ -20,7 +20,7 @@ expect(clean_output(app.output)).to match(Regexp.new(<<~REGEX)) remote: -----> Python app detected remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: Collecting urllib3 @@ -33,7 +33,7 @@ expect(clean_output(app.output)).to include(<<~OUTPUT) remote: -----> Python app detected remote: -----> No change in requirements detected, installing from cache - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: -----> Discovering process types @@ -54,7 +54,7 @@ remote: -----> Python app detected remote: -----> Requirements file has been changed, clearing cached dependencies remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: Collecting urllib3 diff --git a/spec/hatchet/pipenv_spec.rb b/spec/hatchet/pipenv_spec.rb index f3e175e08..389e31d09 100644 --- a/spec/hatchet/pipenv_spec.rb +++ b/spec/hatchet/pipenv_spec.rb @@ -10,7 +10,7 @@ remote: -----> Python app detected remote: cp: cannot stat '/tmp/build_.*/requirements.txt': No such file or directory remote: -----> Installing python-#{python_version} - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Installing dependencies from Pipfile.lock \\(.*\\)... remote: -----> Installing SQLite3 @@ -30,7 +30,7 @@ remote: ! No 'Pipfile.lock' found! We recommend you commit this into your repository. remote: cp: cannot stat '/tmp/build_.*/requirements.txt': No such file or directory remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Installing dependencies from Pipfile... remote: -----> Installing SQLite3 @@ -48,7 +48,7 @@ remote: -----> Python app detected remote: cp: cannot stat '/tmp/build_.*/requirements.txt': No such file or directory remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Installing dependencies from Pipfile.lock \\(aad8b1\\)... remote: -----> Installing SQLite3 @@ -70,7 +70,7 @@ remote: Learn More: https://devcenter.heroku.com/articles/python-2-7-eol-faq remote: cp: cannot stat '/tmp/build_.*/requirements.txt': No such file or directory remote: -----> Installing python-#{LATEST_PYTHON_2_7} - remote: -----> Installing pip 20.1.1, setuptools 44.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 44.1.1 and wheel 0.36.2 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Installing dependencies from Pipfile.lock \\(b8efa9\\)... remote: -----> Installing SQLite3 @@ -139,7 +139,7 @@ remote: Learn More: https://devcenter.heroku.com/articles/python-runtimes remote: cp: cannot stat '/tmp/build_.*/requirements.txt': No such file or directory remote: -----> Installing python-3.9.1 - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Installing dependencies from Pipfile.lock \\(e13df1\\)... remote: -----> Installing SQLite3 @@ -186,7 +186,7 @@ remote: -----> Python app detected remote: cp: cannot stat '/tmp/build_.*/requirements.txt': No such file or directory remote: -----> Installing python-#{LATEST_PYTHON_3_9} - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Installing dependencies from Pipfile.lock \\(75eae0\\)... remote: -----> Installing SQLite3 @@ -203,7 +203,7 @@ expect(clean_output(app.output)).to include(<<~OUTPUT) remote: -----> Python app detected remote: -----> Installing python-#{LATEST_PYTHON_3_9} - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Installing dependencies from Pipfile.lock (ef68d1)... remote: -----> Installing SQLite3 @@ -221,7 +221,7 @@ remote: -----> Python app detected remote: cp: cannot stat '/tmp/build_.*/requirements.txt': No such file or directory remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Your Pipfile.lock \\(aad8b1\\) is out of date. Expected: \\(ef68d1\\). remote: \\[DeployException\\]: .* diff --git a/spec/hatchet/python_version_spec.rb b/spec/hatchet/python_version_spec.rb index 370a9e857..bae504d8c 100644 --- a/spec/hatchet/python_version_spec.rb +++ b/spec/hatchet/python_version_spec.rb @@ -8,7 +8,7 @@ expect(clean_output(app.output)).to include(<<~OUTPUT) remote: -----> Python app detected remote: -----> Installing python-#{python_version} - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: Collecting urllib3 @@ -82,7 +82,7 @@ remote: ! Python 2 has reached its community EOL. Upgrade your Python runtime to maintain a secure application as soon as possible. remote: Learn More: https://devcenter.heroku.com/articles/python-2-7-eol-faq remote: -----> Installing python-#{LATEST_PYTHON_2_7} - remote: -----> Installing pip 20.1.1, setuptools 44.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 44.1.1 and wheel 0.36.2 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: Collecting urllib3 @@ -180,7 +180,7 @@ expect(clean_output(app.output)).to include(<<~OUTPUT) remote: -----> Python app detected remote: -----> Installing pypy2.7-#{LATEST_PYPY_2_7} - remote: -----> Installing pip 20.1.1, setuptools 44.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 44.1.1 and wheel 0.36.2 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: Collecting urllib3 @@ -198,7 +198,7 @@ expect(clean_output(app.output)).to include(<<~OUTPUT) remote: -----> Python app detected remote: -----> Installing pypy3.6-#{LATEST_PYPY_3_6} - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: Collecting urllib3 @@ -240,7 +240,7 @@ remote: -----> Found python-#{LATEST_PYTHON_3_6}, removing remote: -----> No change in requirements detected, installing from cache remote: -----> Installing python-#{LATEST_PYTHON_3_9} - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: Collecting urllib3 diff --git a/spec/hatchet/stack_spec.rb b/spec/hatchet/stack_spec.rb index 56c0efe7d..1a5d356c3 100644 --- a/spec/hatchet/stack_spec.rb +++ b/spec/hatchet/stack_spec.rb @@ -29,7 +29,7 @@ remote: -----> Stack has changed from heroku-18 to heroku-20, clearing cache remote: -----> No change in requirements detected, installing from cache remote: -----> Installing python-3.6.12 - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: Collecting urllib3 @@ -56,7 +56,7 @@ remote: -----> Stack has changed from heroku-20 to heroku-18, clearing cache remote: -----> No change in requirements detected, installing from cache remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} - remote: -----> Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.36.2 + remote: -----> Installing pip 20.2.4, setuptools 47.1.1 and wheel 0.36.2 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: Collecting urllib3