Stop using pkg_resources #1851
Merged
Stop using pkg_resources #1851
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
legoktm
force-pushed
the
pkg_resources
branch
2 times, most recently
from
86418bd
to
37eed03
Compare
legoktm
force-pushed
the
pkg_resources
branch
from
37eed03
to
31477a4
Compare
|
(will need a rebase and unfortuantely there are a couple more places that introduced pkg_resources in the Veracrypt work, in export_wizard.py and export_wizard_page.py, didn't know this was on deck sorry) |
rocodes
force-pushed
the
pkg_resources
branch
from
31477a4
to
90d20a9
Compare
|
(Rebased + removed pkg_resources in export_wizard and export_wizard_page) |
|
oh there's now an isort conflict, one minute... |
legoktm
force-pushed
the
pkg_resources
branch
from
90d20a9
to
3a48e18
Compare
pkg_resources is deprecated and we're supposed to use importlib.resources instead. Unfortunately it's very awkward to use because it wants to support being able to read from possibly compressed archives or other Python package distribution formats. Since our distribution mechanism is Debian packages, we can avoid all of this entirely and just read the files off disk like any other file. A new `load_relative_css` helper finds CSS files next to the file invoking the function. Take the opportunity to simplify font loading: instead of hardcoding each font, just load every TTF in the fonts/ directory by using a recursive glob. And then drop some tests that don't test anything useful Fixes #1672. Fixes #1836.
legoktm
force-pushed
the
pkg_resources
branch
from
3a48e18
to
0659565
Compare
rocodes
approved these changes
Feb 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
Ready for review
Description
pkg_resources is deprecated and we're supposed to use
importlib.resources instead. Unfortunately it's very awkward
to use because it wants to support being able to read from
possibly compressed archives or other Python package distribution
formats.
Since our distribution mechanism is Debian packages, we can avoid
all of this entirely and just read the files off disk like any
other file.
Take the opportunity to simplify font loading: instead of hardcoding
each font, just load every TTF in the fonts/ directory by using a
recursive glob.
And then drop some tests that don't test anything useful
Fixes #1672.
Fixes #1836.
Test Plan
Checklist
If these changes modify code paths involving cryptography, the opening of files in VMs or network (via the RPC service) traffic, Qubes testing in the staging environment is required. For fine tuning of the graphical user interface, testing in any environment in Qubes is required. Please check as applicable:
If these changes add or remove files other than client code, the AppArmor profile may need to be updated. Please check as applicable: