Remove deprecated pkg-resources, replace with packaging #152
Conversation
marmarta
force-pushed
the
remove_pkg_resources
branch
from
37d9712
to
4f29dd3
Compare
| @@ -21,7 +21,7 @@ | |||
|
|
|||
| import os | |||
|
|
|||
| import pkg_resources | |||
| import packaging | |||
There was a problem hiding this comment.
There is a problem with this. The code in vmupdate/agent directory is copied into VM and run there. This means the dependency on the dom0 package is not enough. And indeed the python3-packaging is not installed in a minimal template by default...
Looking for what it's used, maybe it can be dropped and replaced with just int() ? or some local helper if any distribution has X.Y in the version id field.
marmarta
force-pushed
the
remove_pkg_resources
branch
2 times, most recently
from
f4d68d7
to
d2c10aa
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #152 +/- ##
=======================================
Coverage ? 72.96%
=======================================
Files ? 10
Lines ? 1154
Branches ? 0
=======================================
Hits ? 842
Misses ? 312
Partials ? 0 ☔ View full report in Codecov by Sentry. |
OpenQA test summaryComplete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2024071910-4.3&flavor=pull-requests Test run included the following:
New failures, excluding unstableCompared to: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2024070519-4.3&flavor=update
Failed tests9 failures
Fixed failuresCompared to: https://openqa.qubes-os.org/tests/105374#dependencies 5 fixed
Unstable tests
|
rpm_spec/core-dom0-linux.spec.in
Outdated
| @@ -48,6 +48,7 @@ Requires: qubes-core-admin-client | |||
| Requires: qubes-utils >= 3.1.3 | |||
| Requires: qubes-utils-libs >= 4.0.16 | |||
| Requires: qubes-rpm-oxide | |||
| Requires: python3-packaging | |||
There was a problem hiding this comment.
This dependency is in fact not needed anymore.
marmarta
force-pushed
the
remove_pkg_resources
branch
from
d2c10aa
to
38cab01
Compare
references QubesOS/qubes-issues#9195