Fix mastodon-py dist-info handling #336
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
crates/install-wheel-rs/src/wheel.rs
Outdated
| (match crate::find_dist_info(filename, archive.file_names().map(|name| (name, name))) { | ||
| Ok((_, dist_info_dir)) => Ok(dist_info_dir.to_string()), | ||
| Err(err) => Err(Error::InvalidWheel(err)), | ||
| })?; |
There was a problem hiding this comment.
I find this much clearer as:
let dist_info_prefix = match crate::find_dist_info(filename, archive.file_names().map(|name| (name, name))) {
Ok((_, dist_info_dir)) => dist_info_dir.to_string(),
Err(err) => return Err(Error::InvalidWheel(err)),
};| let dist_info_dir = find_dist_info(filename, archive.file_names().map(|name| (name, name))) | ||
| .map_err(|err| format_err!("Invalid wheel {filename}: {err}"))? | ||
| .1 | ||
| .to_string(); |
There was a problem hiding this comment.
Is this .to_string necessary? We immediately pass this to a format call.
| dist_infos.join(", ") | ||
| ))); | ||
| } | ||
| }; |
There was a problem hiding this comment.
So what happened to these errors? Are they no longer ever surfaced? Should we remove them from the enum?
There was a problem hiding this comment.
There are still other cases where Error::InvalidWheel is used
mastodon-py 1.5.1 uses a dot in its dist-info dir name, which we previously didn't handle, causing home-assistant to fail. The new implementation is based on https://github.com/pypa/packaging/blob/2f83540272e79e3fe1f5d42abae8df0c14ddf4c2/src/packaging/utils.py#L146-L172. Part of #199 ``` unzip -l Mastodon.py-1.5.1-py2.py3-none-any.whl Archive: Mastodon.py-1.5.1-py2.py3-none-any.whl Length Date Time Name --------- ---------- ----- ---- 153929 2020-02-29 17:39 mastodon/Mastodon.py 1029 2019-10-11 19:15 mastodon/__init__.py 7357 2019-10-11 20:24 mastodon/streaming.py 10 2020-03-14 18:14 Mastodon.py-1.5.1.dist-info/DESCRIPTION.rst 1398 2020-03-14 18:14 Mastodon.py-1.5.1.dist-info/metadata.json 9 2020-03-14 18:14 Mastodon.py-1.5.1.dist-info/top_level.txt 110 2020-03-14 18:14 Mastodon.py-1.5.1.dist-info/WHEEL 1543 2020-03-14 18:14 Mastodon.py-1.5.1.dist-info/METADATA 753 2020-03-14 18:14 Mastodon.py-1.5.1.dist-info/RECORD --------- ------- 166138 9 files ```
konstin
force-pushed
the
fix-mastodon-py
branch
from
7dd45f9 to
c5bda98
Compare
|
Merging this since i need it for the top 8k pypi checks |
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.
mastodon-py 1.5.1 uses a dot in its dist-info dir name, which we previously didn't handle, causing home-assistant to fail. The new implementation is based on https://github.com/pypa/packaging/blob/2f83540272e79e3fe1f5d42abae8df0c14ddf4c2/src/packaging/utils.py#L146-L172.
Part of #199