Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: upgrade minimum pip version #1716

Merged
merged 4 commits into from
Jul 10, 2024
Merged

feat: upgrade minimum pip version #1716

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33d5a62
feat: upgrade minimum pip version
lengau Jul 2, 2024
6e7f485
chore: autoformat
lengau Jul 3, 2024
53846c8
fix: only hash from requirements file
lengau Jul 9, 2024
c8be400
Merge branch 'main' into work/CRAFT-2538/1456-strict-dependencies-pre…
lengau Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions charmcraft/charm_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@
validate_strict_dependencies,
)

MINIMUM_PIP_VERSION = (23, 0)
KNOWN_GOOD_PIP_URL = "https://files.pythonhosted.org/packages/ba/19/e63fb4e0d20e48bd2167bb7e857abc0e21679e24805ba921a224df8977c0/pip-23.2.1.tar.gz"
MINIMUM_PIP_VERSION = (24, 1)
KNOWN_GOOD_PIP_URL = "https://files.pythonhosted.org/packages/c0/d0/9641dc7b05877874c6418f8034ddefc809495e65caa14d38c7551cd114bb/pip-24.1.1.tar.gz"
KNOWN_GOOD_PIP_HASH = "sha256:5aa64f65e1952733ee0a9a9b1f52496ebdb3f3077cc46f80a16d983b58d1180a"


def relativise(src, dst):
Expand Down Expand Up @@ -237,7 +238,7 @@ def _install_dependencies(self, staging_venv_dir):
# common charm dependencies (e.g. ops). Resolve this by updating to a
# known working version of pip.
if get_pip_version(pip_cmd) < MINIMUM_PIP_VERSION:
_process_run([pip_cmd, "install", f"pip@{KNOWN_GOOD_PIP_URL}"])
_process_run([pip_cmd, "install", f"pip@{KNOWN_GOOD_PIP_URL}", f"--hash={KNOWN_GOOD_PIP_HASH}"])

with instrum.Timer("Installing all dependencies"):
if self.strict_dependencies:
Expand Down
11 changes: 6 additions & 5 deletions tests/test_charm_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

from charmcraft import charm_builder, const
from charmcraft.charm_builder import (
KNOWN_GOOD_PIP_HASH,
KNOWN_GOOD_PIP_URL,
CharmBuilder,
_process_run,
Expand Down Expand Up @@ -610,7 +611,7 @@ def test_build_dependencies_virtualenv_simple(tmp_path, assert_output):

assert mock.mock_calls == [
call(["python3", "-m", "venv", str(tmp_path / const.STAGING_VENV_DIRNAME)]),
call([pip_cmd, "install", f"pip@{KNOWN_GOOD_PIP_URL}"]),
call([pip_cmd, "install", f"pip@{KNOWN_GOOD_PIP_URL}", f"--hash={KNOWN_GOOD_PIP_HASH}"]),
call([pip_cmd, "install", f"--requirement={reqs_file}"]),
]

Expand Down Expand Up @@ -649,7 +650,7 @@ def test_build_dependencies_virtualenv_multiple(tmp_path, assert_output):
pip_cmd = str(charm_builder._find_venv_bin(tmp_path / const.STAGING_VENV_DIRNAME, "pip"))
assert mock.mock_calls == [
call(["python3", "-m", "venv", str(tmp_path / const.STAGING_VENV_DIRNAME)]),
call([pip_cmd, "install", f"pip@{KNOWN_GOOD_PIP_URL}"]),
call([pip_cmd, "install", f"pip@{KNOWN_GOOD_PIP_URL}", f"--hash={KNOWN_GOOD_PIP_HASH}"]),
call(
[
pip_cmd,
Expand Down Expand Up @@ -712,7 +713,7 @@ def test_build_dependencies_virtualenv_packages(tmp_path, assert_output):

assert mock.mock_calls == [
call(["python3", "-m", "venv", str(tmp_path / const.STAGING_VENV_DIRNAME)]),
call([pip_cmd, "install", f"pip@{KNOWN_GOOD_PIP_URL}"]),
call([pip_cmd, "install", f"pip@{KNOWN_GOOD_PIP_URL}", f"--hash={KNOWN_GOOD_PIP_HASH}"]),
call([pip_cmd, "install", "--no-binary=pkg1,pkg2", "pkg1", "pkg2"]),
]

Expand Down Expand Up @@ -747,7 +748,7 @@ def test_build_dependencies_virtualenv_binary_packages(tmp_path, assert_output):

assert mock.mock_calls == [
call(["python3", "-m", "venv", str(tmp_path / const.STAGING_VENV_DIRNAME)]),
call([pip_cmd, "install", f"pip@{KNOWN_GOOD_PIP_URL}"]),
call([pip_cmd, "install", f"pip@{KNOWN_GOOD_PIP_URL}", f"--hash={KNOWN_GOOD_PIP_HASH}"]),
call([pip_cmd, "install", "pkg1", "pkg2"]),
]

Expand Down Expand Up @@ -788,7 +789,7 @@ def test_build_dependencies_virtualenv_all(tmp_path, assert_output):

assert mock.mock_calls == [
call(["python3", "-m", "venv", str(tmp_path / const.STAGING_VENV_DIRNAME)]),
call([pip_cmd, "install", f"pip@{KNOWN_GOOD_PIP_URL}"]),
call([pip_cmd, "install", f"pip@{KNOWN_GOOD_PIP_URL}", f"--hash={KNOWN_GOOD_PIP_HASH}"]),
call(
[
pip_cmd,
Expand Down
Loading