Skip to content

Commit

Permalink
Bump pip from 24.0 to 24.3.1 (#1685)
Browse files Browse the repository at this point in the history
* Bump pip from 24.0 to 24.3.1

Bumps [pip](https://github.com/pypa/pip) from 24.0 to 24.3.1.
- [Changelog](https://github.com/pypa/pip/blob/main/NEWS.rst)
- [Commits](pypa/pip@24.0...24.3.1)

---
updated-dependencies:
- dependency-name: pip
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update tests + comments

* Add changelog entry

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ed Morley <501702+edmorley@users.noreply.github.com>
  • Loading branch information
dependabot[bot] and edmorley authored Dec 3, 2024
1 parent 5409e5e commit 6be689b
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## [Unreleased]

- Updated pip from 24.0 to 24.3.1. ([#1685](https://github.com/heroku/heroku-buildpack-python/pull/1685))

## [v267] - 2024-11-12

Expand Down
5 changes: 2 additions & 3 deletions lib/cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,8 @@ function cache::restore() {
cached_pip_version="$(meta_prev_get "pip_version")"
# Handle caches written by buildpack versions older than v252 (see above).
if [[ -z "${cached_pip_version}" ]]; then
# Whilst we don't know the old version, we know the pip version has likely
# changed since the last build, and would rather err on the side of caution.
# (The pip version was last updated in v246, but will be updated again soon.)
# Whilst we don't know the old version, we know the pip version has definitely
# changed since buildpack v251.
cache_invalidation_reasons+=("The pip version has changed")
elif [[ "${cached_pip_version}" != "${PIP_VERSION:?}" ]]; then
cache_invalidation_reasons+=("The pip version has changed from ${cached_pip_version} to ${PIP_VERSION}")
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pip==24.0
pip==24.3.1
5 changes: 4 additions & 1 deletion spec/hatchet/pip_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@
remote: Preparing metadata \\(setup.py\\): finished with status 'done'
remote: .+
remote: Installing collected packages: six, test
remote: DEPRECATION: Legacy editable install of test==0.0.0 from file:///tmp/build_.* \\(setup.py develop\\) is deprecated. pip 25.0 will enforce this behaviour change. A possible replacement is to add a pyproject.toml or enable --use-pep517, and use setuptools >= 64. If the resulting installation is not behaving as expected, try using --config-settings editable_mode=compat. Please consult the setuptools documentation for more information. Discussion can be found at https://github.com/pypa/pip/issues/11457
remote: Running setup.py develop for test
REGEX
end
Expand Down Expand Up @@ -254,7 +255,9 @@
app.deploy do |app|
expect(clean_output(app.output)).to include(<<~OUTPUT)
remote: -----> Installing dependencies using 'pip install -r requirements.txt'
remote: ERROR: Invalid requirement: 'an-invalid-requirement!' (from line 1 of requirements.txt)
remote: ERROR: Invalid requirement: 'an-invalid-requirement!': Expected end or semicolon (after name and no valid version specifier)
remote: an-invalid-requirement!
remote: ^ (from line 1 of requirements.txt)
remote:
remote: ! Error: Unable to install dependencies using pip.
remote: !
Expand Down
10 changes: 5 additions & 5 deletions spec/hatchet/python_version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
# This test performs an initial build using an older buildpack version, followed
# by a build using the current version. This ensures that the current buildpack
# can successfully read the version metadata written to the build cache in the past.
let(:buildpacks) { ['https://github.com/heroku/heroku-buildpack-python#v250'] }
let(:buildpacks) { ['https://github.com/heroku/heroku-buildpack-python#v257'] }

it 'builds with the same Python version as the last build' do
app.deploy do |app|
Expand All @@ -61,11 +61,11 @@
app.push!
expect(clean_output(app.output)).to include(<<~OUTPUT)
remote: -----> Python app detected
remote: -----> No Python version was specified. Using the same version as the last build: Python 3.12.3
remote: -----> No Python version was specified. Using the same version as the last build: Python 3.12.6
remote: To use a different version, see: https://devcenter.heroku.com/articles/python-runtimes
remote: -----> Discarding cache since:
remote: - The pip version has changed
remote: -----> Installing Python 3.12.3
remote: - The pip version has changed from 24.0 to #{PIP_VERSION}
remote: -----> Installing Python 3.12.6
remote:
remote: ! Warning: A Python security update is available!
remote: !
Expand All @@ -74,7 +74,7 @@
remote:
remote: -----> Installing pip #{PIP_VERSION}, setuptools #{SETUPTOOLS_VERSION} and wheel #{WHEEL_VERSION}
OUTPUT
expect(app.run('python -V')).to include('Python 3.12.3')
expect(app.run('python -V')).to include('Python 3.12.6')
end
end
end
Expand Down

0 comments on commit 6be689b

Please sign in to comment.