Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parse raw metadata #671

Merged
merged 33 commits into from Feb 1, 2023
Merged

Parse raw metadata #671

merged 33 commits into from Feb 1, 2023

Conversation

brettcannon
Copy link
Member

Part of #570

This PR copies the RawMetadata and parse_email() parts of #574 , adds tests and docs, and makes everything to work. I'm purposefully ignoring any emission to other formats or parsing of anything but email headers to make progress.

Because this PR uses TypedDict and we have no dependencies, it can't be supported by Python 3.7. Luckily it hits EOL in June of this year. But that does mean we need to wait to merge this until we are ready to drop Python 3.7 support (which I'm personally ready to do 😁).

@brettcannon brettcannon mentioned this pull request Jan 24, 2023
3 tasks
src/packaging/metadata.py Outdated Show resolved Hide resolved
src/packaging/metadata.py Outdated Show resolved Hide resolved
src/packaging/metadata.py Outdated Show resolved Hide resolved
@pfmoore
Copy link
Member

pfmoore commented Jan 24, 2023

Overall, this LGTM. Just a few minor points (mostly typos). And can I just say that I appreciate the extensive commenting of the code, it made it very easy to see what was going on, and getting this right is fiddly, so it's doubly important to have a good understanding of the code.

Copy link
Member

@dstufft dstufft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything looks great here!

src/packaging/metadata.py Outdated Show resolved Hide resolved
@brettcannon
Copy link
Member Author

Overall, this LGTM. Just a few minor points (mostly typos). And can I just say that I appreciate the extensive commenting of the code, it made it very easy to see what was going on, and getting this right is fiddly, so it's doubly important to have a good understanding of the code.

Most of those comments are compliments of @dstufft . 🙂

brettcannon and others added 2 commits January 24, 2023 15:29
Co-authored-by: Donald Stufft <donald@stufft.io>
Co-authored-by: Paul Moore <p.f.moore@gmail.com>
@brettcannon
Copy link
Member Author

@pradyunsg what do you want to do about the Python 3.8 requirement? Should I hold off on merging this until 3.7 hits EOL, or at this point are we assuming the next release can drop 3.7 support regardless of when it comes out?

Copy link
Contributor

@hauntsaninja hauntsaninja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that if you want you can get this to work and type check on 3.7.

Just use:

if typing.TYPE_CHECKING:
    from typing_extensions import TypedDict
    class RawMetadata(TypedDict, total=False): ...
else:
    RawMetadata = Dict[str, Any]  # or even just object()

Type checkers are special cased to always know what typing_extensions is, even if it's not installed. If you want something a little less mendacious, you can use an additional sys.version_info check

@pradyunsg
Copy link
Member

pradyunsg commented Jan 30, 2023

Should I hold off on merging this until 3.7 hits EOL, or at this point are we assuming the next release can drop 3.7 support regardless of when it comes out?

Let's hold off, for now; unless what's suggested above works. :)

@hauntsaninja
Copy link
Contributor

The current linting error can be fixed by upgrading isort to >= 5.12, see PyCQA/isort#2077

@brettcannon
Copy link
Member Author

The suggestion from @hauntsaninja seems to work!

@pradyunsg now what do you think about merging this?

@hauntsaninja
Copy link
Contributor

hauntsaninja commented Jan 31, 2023

If you want to make the TypedDict class available at runtime (on 3.8 and newer), and get rid of an indent level, here is what a less mendacious version could look like:

import typing
import sys

if sys.version_info >= (3, 8):
    from typing import TypedDict
else:
    if typing.TYPE_CHECKING:
        from typing_extensions import TypedDict
    else:
        try:
            from typing_extensions import TypedDict
        except ImportError:
            class TypedDict:
                def __init_subclass__(*a, **kw): ...

class RawMetadata(TypedDict, total=False):
    metadata_version: str
     ...

Copy link
Member

@pradyunsg pradyunsg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! I trust @brettcannon's judgement on what to do with the TypedDict story, with a preference for not dropping support for 3.7 eagerly. :)

@pradyunsg
Copy link
Member

@pradyunsg now what do you think about merging this?

If you're happy with the logic around TypedDict, please feel welcome to land this!

@brettcannon
Copy link
Member Author

I'm trying out the latest suggestion from @hauntsaninja since it might help something like Pydantic that might care about TypedDict being real. If the tests all pass I'm good to merge this.

@brettcannon brettcannon merged commit 7722044 into pypa:main Feb 1, 2023
@brettcannon brettcannon deleted the raw-metadata branch February 1, 2023 19:25
@brettcannon
Copy link
Member Author

Thank for the help, everyone!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants