Read wheel metadata from wheel directly #7538
Merged
Conversation
This file contains hidden or 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
With this parameter we can incrementally update code to rely on the zip file instead of the unpacked source directory.
Since zips don't typically contain directory entries, we want to only operate on files. Adding files to the .dist-info tests means we will be able to reuse them for both cases, while they coexist.
First example of transitioning a directory-aware function to using a zipfile directly. Since we will not need to maintain the unpacked dir going forward, we don't need to worry about making wheel_dist_info_dir "generic", just that the same tests pass for both cases at each commit. To do this neatly we use pytest.fixture(params=[...]), which generates a test for each param. Once we've transitioned the necessary functions we only need to replace the fixture name and remove the dead code.
Since we don't pass the source dir anymore, we can simplify the tests and implementation for wheel_dist_info_dir.
Makes it simpler to substitute in zip-derived WHEEL extraction.
Since we don't pass the source directory anymore, remove the tests and implementation.
This functions as a guard for the rest of our wheel-handling code, ensuring that we will only get past this point if we have a wheel that we should be able to handle version-wise. We return a tuple instead of bundling up the result in a dedicated type because it's the simplest option. The interface will be easy to update later if the need arises.
chrahunt
added
type: refactor
chrahunt
force-pushed
the
refactor/get-metadata-from-zip
branch
2 times, most recently
from
4a1ef42 to
2f92826
Compare
chrahunt
changed the title
xavfernandez
approved these changes
Jan 2, 2020
tests/unit/test_wheel.py
Outdated
| yield make_zip | ||
|
|
||
|
|
||
| @pytest.fixture(params=[True, False]) |
There was a problem hiding this comment.
😮 I did not know this was possible ^^
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.
More preliminary work for direct-from-wheel metadata reading. Now instead of reading
metadata from the unpacked wheel files on disk, we read it from a ZipFile which wraps
the wheel file itself.
In order to ensure a compatible implementation, tests pass in each step as we incrementally:
Progresses #6030 and the simplification of wheel builder mentioned in #7483 (comment).