Refactor wheel info extraction during install #7536
Merged
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
This will let us use the value for later processing.
This will let us re-use the wheel_metadata for other parts of processing, and by parameterizing checks in terms of metadata we will be able to substitute in metadata derived directly from the zip.
The _invalidversion_ tests are not applicable to the new function since we do not use a regex to find the applicable folder.
This will make it easier to transition to the already-determined dist-info directory and reduces some of our dependence on pkg_resources. Despite the name, the `egg_info` member is also populated for .dist-info dirs. ensure_str uses encoding='utf-8' and errors='strict' for Python 3 by default, which matches the behavior in `pkg_resources.NullProvider.get_metadata`.
Since retrieval of the .dist-info dir already ensures that a distribution is found, this reduces responsibility on wheel_metadata and lets us remove a few tests already covered by the tests for test_wheel_dist_info_dir_*.
chrahunt
added
type: refactor
chrahunt
changed the title
xavfernandez
approved these changes
Jan 1, 2020
|
|
||
| info_dir_name = canonicalize_name(info_dir) | ||
| canonical_name = canonicalize_name(name) | ||
| if not info_dir_name.startswith(canonical_name): |
There was a problem hiding this comment.
nit (and for a follow-up PR): since we have canonicalized everything we might as well check for an exact match
if not info_dir_name[:-len('.dist-info')] == canonical_name
this would catch a messed-up wheel with canonical_name = foobar and info_dir_name = foobar1234.dist-info.
There was a problem hiding this comment.
Since the .dist-info dir also has version, we would need that too.
lock
bot
added
the
auto-locked
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This reorganizes and extracts some shared functionality out of
install_unpacked_wheelinto separate functions.In addition to setting us up for extracting metadata directly from wheel files (and installing directly from wheel files), this also:
pkg_resources*.dist-info/WHEELthat was being done for Path-Is-PurelibProgresses #7413, #6030, and the simplification of wheel builder mentioned in #7483 (comment).