Remove vendored pip and add Metadata class #87
Conversation
ryanking13
changed the title
| """Unsupported wheel.""" | ||
|
|
||
|
|
||
| def wheel_dist_info_dir(source: ZipFile, name: str) -> str: |
There was a problem hiding this comment.
I think there is not much reason to import this from pyodide. I move it to metadata.py.
Thanks that sounds reasonable. I'm just wondering whether we could more explicitly separate what comes from micropip and what is a class that you added. So that say it would be easier to diff against upstream changes in the future if we decide to sync with changes to those functions in pip. Unless it's a loose adaptation and essentially an independent code base. |
I think this is kind of the way this PR is implemented. I did some copy-paste, but also did some rewrite as well. So if you are okay I would like to merge this as is. Maybe I'll open a follow-up PR that moves methods that come from pip without any modification to the separate file so we can easily distinguish them. |
| @@ -0,0 +1,158 @@ | |||
| Metadata-Version: 2.1 | |||
There was a problem hiding this comment.
Can you gzip test data so they don't produce noise when grepping please?
| _requires: list[Requirement] | None = None # List of requirements. | ||
|
|
||
| # Note: `_project_name`` is taken from the wheel metadata, while `name` is taken from the wheel filename or metadata of the package index. | ||
| # They are mostly the same, but can be different in some weird cases (e.g. a user manually renaming the wheel file), so just to be safe we store both. | ||
| _project_name: str | None = None # Project name. |
There was a problem hiding this comment.
So we would no longer get the name from the wheel metadata. then? I feel it's a safer source than the filename.
There was a problem hiding this comment.
no longer get the name from the wheel metadata. then?
Interestingly, we didn't calculate the name from the metadata even before.
The project_name was calculated by just escaping the name that was passed by the caller.
I moved this part to __post_init__ method. So the behavior is not changed in this PR.
There was a problem hiding this comment.
I'll open a follow-up PR to parse the package name from the metadata file.
This PR is a preparation to support PEP 658: Serve Distribution Metadata in the Simple Repository API.
In order to support PEP 658, we need a class that can parse the Distribution Metadata file. For now, this it is implemented inside the vendored pip.
The vendored pip code contains a bunch of codes that we are not using anymore, and it does not expose an API for parsing a single metadata file. So this PR removes the vendored pip, and instead adds a class
Metadatathat handles parsing the metadata file and calculating requirements.