Don't assume Python modules are in sysconfig.get_path('purelib') #3646
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
|
BTW this is a backward-compatible fix. |
sysconfig.get_path('purelib') returns a location where pure Python modules
should be installed, which is not necessarily where they are loaded from.
Since Fedora 36, sysconfig uses a different install scheme for RPM packages
and for other packages (e.g. installed by pip, setuptools, distutils...).
Without additional context, the scheme for "other" is the default.
Hence, sysconfig.get_path('purelib') returns /usr/local/lib/python3.10/site-packages.
But dracut needs the files installed from RPM packages.
See the announcement about the change in Fedora's Python:
https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/AAGUFQZ4RZDU7KUN4HA43KQJCMSFR3GW/
Instead of directly asking for RPM locations,
we won't assume "where to install stuff" and "where is stuff imported from"
is the same question and we inspect sys.path instead.
To be able to reference specific Python modules,
we use importlib.util.find_spec() (available since Python 3.4).
Resolves https://bugzilla.redhat.com/show_bug.cgi?id=2012513
This change also has 2 added benefits:
- It loads information from all Python import paths,
not just 2, so when we add modules from /usr/lib64/python3.10/site-packages,
this script won't need changes.
- It does not assume where hardcoded modules are installed,
so when requests turn into a single-file library requests.py or to an
extension module (both unlikely, but technically possible),
or sysconfig becomes a package with __init__.py,
this script won't need changes.
hroncok
force-pushed
the
dracut_no_sysconfig_paths
branch
from
3e15a44
to
b452377
Compare
|
I've amended the commit message slightly, but the force push had no code changes. |
|
The packit failure is not related. |
|
/kickstart-test --testtype smoke |
hroncok
commented
Oct 11, 2021
poncovka
approved these changes
Oct 11, 2021
VladimirSlavik
approved these changes
Oct 11, 2021
jkonecny12
approved these changes
Oct 11, 2021
M4rtinK
approved these changes
Oct 11, 2021
|
Thank you all for the super fast reviews! |
1 task
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.
sysconfig.get_path('purelib') returns a location where pure Python modules
should be installed, which is not necessarily where they are loaded from.
Since Fedora 36, sysconfig uses a different install scheme for RPM packages
and for other packages (e.g. installed by pip, setuptools, distutils...).
Without additional context, the scheme for "other" is the default.
Hence, sysconfig.get_path('purelib') returns /usr/local/lib/python3.10/site-packages.
But dracut needs the files installed from RPM packages.
See the announcement about the change in Fedora's Python:
https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/AAGUFQZ4RZDU7KUN4HA43KQJCMSFR3GW/
Instead of directly asking for RPM locations,
we won't assume "where to install stuff" and "where is stuff imported from"
is the same question and we inspect sys.path instead.
To be able to reference specific Python modules,
we use importlib.util.find_spec() (available since Python 3.4).
Resolves https://bugzilla.redhat.com/show_bug.cgi?id=2012513
This change also has 2 added benefits:
It loads information from all Python import paths,
not just 2, so when we add modules from /usr/lib64/python3.10/site-packages,
this script won't need changes.
It does not assume where hardcoded modules are installed,
so when requests turn into a single-file library requests.py or to an
extension module (both unlikely, but technically possible),
or sysconfig becomes a package with init.py,
this script won't need changes.