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

chore(merge): '1.30.1' into 'main' #760

Merged
merged 8 commits into from
Jun 24, 2024
Merged

chore(merge): '1.30.1' into 'main' #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0e3ff49
chore: fix typos
tigarmo Jun 19, 2024
bf48cfe
fix(setup.py): temporarily limits `requests` version ... (#741)
liushuyu May 22, 2024
ab47ebc
chore: ruff fixes
tigarmo Jun 19, 2024
09eba2a
chore(ci): bump chisel version
tigarmo Jun 19, 2024
5b5d31f
fix: add list of ignore packages in core24 (#755)
tigarmo Jun 21, 2024
933e981
build: bump version to 1.30.1
mr-cal Jun 21, 2024
7d0c4ca
docs(changelog): add 1.30.1 release notes
mr-cal Jun 21, 2024
cb08571
chore(merge): '1.30.1' into 'merge/1.30.1'
mr-cal Jun 21, 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
30 changes: 30 additions & 0 deletions craft_parts/packages/deb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
}


Expand Down
5 changes: 5 additions & 0 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
-------------------

Expand Down
24 changes: 24 additions & 0 deletions tests/unit/packages/test_deb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Loading