diff --git a/craft_parts/packages/deb.py b/craft_parts/packages/deb.py index a7b31d58..6f77210d 100644 --- a/craft_parts/packages/deb.py +++ b/craft_parts/packages/deb.py @@ -249,6 +249,36 @@ "python3-yaml", "python3-zipp", }, + "core24": { + "python3-attr", + "python3-blinker", + "python3-certifi", + "python3-cffi-backend", + "python3-chardet", + "python3-configobj", + "python3-cryptography", + "python3-dbus", + "python3-debconf", + "python3-idna", + "python3-jinja2", + "python3-json-pointer", + "python3-jsonpatch", + "python3-jsonschema", + "python3-jwt", + "python3-markupsafe", + # Provides /usr/bin/python3, don't bring in unless explicitly requested. + # "python3-minimal" + "python3-netifaces", + "python3-netplan", + "python3-oauthlib", + # Rely on version brought in by setuptools, unless explicitly requested. + # "python3-pkg-resources" + "python3-pyrsistent", + "python3-requests", + "python3-serial", + "python3-urllib3", + "python3-yaml", + }, } diff --git a/docs/changelog.rst b/docs/changelog.rst index f3fa4e5f..4383153e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -23,6 +23,11 @@ Changelog - Add meson plugin reference - Documentation fixes +1.30.1 (2024-06-21) +------------------- + +- Fix list of ignored packages in core24 bases when fetching stage-packages + 1.30.0 (2024-05-16) ------------------- diff --git a/tests/unit/packages/test_deb.py b/tests/unit/packages/test_deb.py index 0267b4fa..612ffb0d 100644 --- a/tests/unit/packages/test_deb.py +++ b/tests/unit/packages/test_deb.py @@ -794,3 +794,27 @@ def test_get_filtered_stage_package_empty_ignore_filter(mocker): ) assert filtered_names == {"some-base-pkg", "some-other-base-pkg"} + + +def test_get_filtered_stage_package_core24(mocker): + mock_get_packages_in_base = mocker.patch.object(deb, "get_packages_in_base") + mock_get_packages_in_base.return_value = [ + DebPackage(name="some-package"), + DebPackage(name="python3-cffi"), + DebPackage(name="python3-cffi-backend"), + DebPackage(name="python3-jsonschema"), + DebPackage(name="python3-attr"), + ] + + filtered_names = deb._get_filtered_stage_package_names( + base="core24", + package_list=[ + DebPackage(name="python3-cffi"), + DebPackage(name="python3-jsonschema"), + ], + base_package_names=None, + ) + + # python3-cffi-backend and python3-attr must NOT be on the list of filtered + # names, even though they are present in the core24 base. + assert filtered_names == {"some-package"}