From 1cb7db9e87e82ae99c091d0bec31b06fe8ad2ed8 Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Thu, 2 Jun 2022 08:39:02 +0100 Subject: [PATCH] Update pip from 22.0.4 to 22.1.2 https://pip.pypa.io/en/stable/news/#v22-1-2 https://github.com/pypa/pip/compare/22.0.4...22.1.2 GUS-W-11228793. --- CHANGELOG.md | 1 + bin/steps/python | 2 +- spec/hatchet/pip_spec.rb | 6 +++--- spec/hatchet/pipenv_spec.rb | 14 +++++++------- spec/hatchet/python_version_spec.rb | 4 ++-- spec/hatchet/stack_spec.rb | 4 ++-- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29ef7b717..df2e3eee5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased +- Update pip from 22.0.4 to 22.1.2 for Python 3.7+ ([#1331](https://github.com/heroku/heroku-buildpack-python/pull/1331)). - Add support for Heroku-22 ([#1299](https://github.com/heroku/heroku-buildpack-python/pull/1299)). ## v211 (2022-05-17) diff --git a/bin/steps/python b/bin/steps/python index aba349f18..cac20ef64 100755 --- a/bin/steps/python +++ b/bin/steps/python @@ -150,7 +150,7 @@ fi set -e -PIP_VERSION='22.0.4' +PIP_VERSION='22.1.2' SETUPTOOLS_VERSION='60.10.0' WHEEL_VERSION='0.37.1' diff --git a/spec/hatchet/pip_spec.rb b/spec/hatchet/pip_spec.rb index 29afc1082..6bccf20b9 100644 --- a/spec/hatchet/pip_spec.rb +++ b/spec/hatchet/pip_spec.rb @@ -22,7 +22,7 @@ remote: -----> No Python version was specified. Using the buildpack default: python-#{DEFAULT_PYTHON_VERSION} remote: To use a different version, see: https://devcenter.heroku.com/articles/python-runtimes remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: Collecting urllib3 @@ -38,7 +38,7 @@ remote: To use a different version, see: https://devcenter.heroku.com/articles/python-runtimes remote: -----> No change in requirements detected, installing from cache remote: -----> Using cached install of python-#{DEFAULT_PYTHON_VERSION} - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: -----> Discovering process types @@ -61,7 +61,7 @@ remote: To use a different version, see: https://devcenter.heroku.com/articles/python-runtimes remote: -----> Requirements file has been changed, clearing cached dependencies remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 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 ffee9e1e3..bb5ffb97a 100644 --- a/spec/hatchet/pipenv_spec.rb +++ b/spec/hatchet/pipenv_spec.rb @@ -11,7 +11,7 @@ remote: -----> Using Python version specified in Pipfile.lock remote: cp: cannot stat '/tmp/build_.*/requirements.txt': No such file or directory remote: -----> Installing python-#{python_version} - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Installing dependencies from Pipfile.lock \\(.*\\)... remote: -----> Installing SQLite3 @@ -46,7 +46,7 @@ remote: To use a different version, see: https://devcenter.heroku.com/articles/python-runtimes remote: cp: cannot stat '/tmp/build_.*/requirements.txt': No such file or directory remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Installing dependencies from Pipfile... remote: -----> Installing SQLite3 @@ -66,7 +66,7 @@ remote: To use a different version, see: https://devcenter.heroku.com/articles/python-runtimes remote: cp: cannot stat '/tmp/build_.*/requirements.txt': No such file or directory remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Installing dependencies from Pipfile.lock \\(aad8b1\\)... remote: -----> Installing SQLite3 @@ -202,7 +202,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.10.0 - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Installing dependencies from Pipfile.lock \\(99d8c9\\)... remote: -----> Installing SQLite3 @@ -262,7 +262,7 @@ remote: -----> Using Python version specified in runtime.txt remote: cp: cannot stat '/tmp/build_.*/requirements.txt': No such file or directory remote: -----> Installing python-#{LATEST_PYTHON_3_10} - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Installing dependencies from Pipfile.lock \\(75eae0\\)... remote: -----> Installing SQLite3 @@ -280,7 +280,7 @@ remote: -----> Python app detected remote: -----> Using Python version specified in Pipfile.lock remote: -----> Installing python-#{LATEST_PYTHON_3_10} - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Installing dependencies from Pipfile.lock (2d32e8)... remote: -----> Installing SQLite3 @@ -300,7 +300,7 @@ remote: To use a different version, see: https://devcenter.heroku.com/articles/python-runtimes remote: cp: cannot stat '/tmp/build_.*/requirements.txt': No such file or directory remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 remote: -----> Installing dependencies with Pipenv 2020.11.15 remote: Your Pipfile.lock \\(aad8b1\\) is out of date. Expected: \\(2d32e8\\). remote: \\[DeployException\\]: .* diff --git a/spec/hatchet/python_version_spec.rb b/spec/hatchet/python_version_spec.rb index 6f62bb286..232e7ff76 100644 --- a/spec/hatchet/python_version_spec.rb +++ b/spec/hatchet/python_version_spec.rb @@ -9,7 +9,7 @@ remote: -----> Python app detected remote: -----> Using Python version specified in runtime.txt remote: -----> Installing python-#{python_version} - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: Collecting urllib3 @@ -331,7 +331,7 @@ remote: -----> Python version has changed from python-#{LATEST_PYTHON_3_9} to python-#{LATEST_PYTHON_3_10}, clearing cache remote: -----> No change in requirements detected, installing from cache remote: -----> Installing python-#{LATEST_PYTHON_3_10} - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 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 961523be2..f3a275eb4 100644 --- a/spec/hatchet/stack_spec.rb +++ b/spec/hatchet/stack_spec.rb @@ -27,7 +27,7 @@ remote: -----> Stack has changed from heroku-20 to heroku-22, clearing cache remote: -----> No change in requirements detected, installing from cache remote: -----> Installing python-3.10.4 - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: Collecting urllib3 @@ -59,7 +59,7 @@ remote: -----> Stack has changed from heroku-22 to heroku-20, clearing cache remote: -----> No change in requirements detected, installing from cache remote: -----> Installing python-#{DEFAULT_PYTHON_VERSION} - remote: -----> Installing pip 22.0.4, setuptools 60.10.0 and wheel 0.37.1 + remote: -----> Installing pip 22.1.2, setuptools 60.10.0 and wheel 0.37.1 remote: -----> Installing SQLite3 remote: -----> Installing requirements with pip remote: Collecting urllib3