Skip to content

Update importlib.metadata typings for 3.10 #7331

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.

Sign up for GitHub

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

Merged
JelleZijlstra merged 19 commits into from
Feb 25, 2022
Merged

Update importlib.metadata typings for 3.10 #7331

Changes from 5 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
32b37e8
Fix importlib_metadata.metadata typings
itaisteinherz Feb 20, 2022
3f301ec
Update importlib_metadata.metadata.entry_points() typings
itaisteinherz Feb 20, 2022
6395541
Fixup method signature
itaisteinherz Feb 20, 2022
10f183e
Some fixes
itaisteinherz Feb 20, 2022
200fba5
Add missing type hint
itaisteinherz Feb 20, 2022
87f2ea7
Add back `EntryPoints`
itaisteinherz Feb 20, 2022
bfc08ce
Revert incorrect change
itaisteinherz Feb 20, 2022
a10cced
Improvements
itaisteinherz Feb 20, 2022
1f5cd36
CR improvements
itaisteinherz Feb 21, 2022
590cd18
Merge branch 'master' into feature/importlib-metadata-updates
srittau Feb 21, 2022
888abb9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 21, 2022
b7b5a99
Restore property lost during merge
srittau Feb 21, 2022
04fc42a
CR improvements
itaisteinherz Feb 22, 2022
e149789
Add missing ellipsis
itaisteinherz Feb 22, 2022
c761e96
Ignore some errors
itaisteinherz Feb 22, 2022
08e2c31
Mention specific attributes and types instead of `params`
itaisteinherz Feb 22, 2022
1ba3666
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 22, 2022
55a29da
Fix annotation of keyword-only arguments
itaisteinherz Feb 23, 2022
c21677d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 31 additions & 7 deletions stdlib/importlib/metadata/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ from pathlib import Path
from typing import Any, ClassVar, Iterable, NamedTuple, Pattern, overload

if sys.version_info >= (3, 10):
from importlib.metadata._meta import PackageMetadata as PackageMetadata
from importlib.metadata._meta import PackageMetadata
Comment thread
itaisteinherz marked this conversation as resolved.
Outdated
def packages_distributions() -> Mapping[str, list[str]]: ...

if sys.version_info >= (3, 8):
Expand All @@ -35,6 +35,16 @@ if sys.version_info >= (3, 8):
dist: ClassVar[Distribution | None]
def matches(self, **params: Any) -> bool: ... # undocumented

if sys.version_info >= (3, 10):
class SelectableGroups(dict): # use as list is deprecated since 3.10
@classmethod
def load(cls, eps: SelectableGroups) -> SelectableGroups: ...
Comment thread
itaisteinherz marked this conversation as resolved.
Outdated
Comment thread
srittau marked this conversation as resolved.
Outdated
@property
def groups(self) -> set[str]: ...
@property
def names(self) -> set[str]: ...
def select(self, **params: Any) -> SelectableGroups: ...
Comment thread
itaisteinherz marked this conversation as resolved.
Outdated
Comment thread
itaisteinherz marked this conversation as resolved.
Outdated

class PackagePath(pathlib.PurePosixPath):
def read_text(self, encoding: str = ...) -> str: ...
def read_binary(self) -> bytes: ...
Expand Down Expand Up @@ -66,13 +76,21 @@ if sys.version_info >= (3, 8):
) -> Iterable[Distribution]: ...
@staticmethod
def at(path: StrPath) -> PathDistribution: ...
@property
def metadata(self) -> Message: ...

if sys.version_info >= (3, 10):
@property
def metadata(self) -> PackageMetadata: ...
@property
def entry_points(self) -> SelectableGroups: ...
else:
@property
def metadata(self) -> Message: ...
@property
def entry_points(self) -> list[EntryPoint]: ...

@property
def version(self) -> str: ...
@property
def entry_points(self) -> list[EntryPoint]: ...
@property
def files(self) -> list[PackagePath] | None: ...
@property
def requires(self) -> list[str] | None: ...
Expand Down Expand Up @@ -109,8 +127,14 @@ if sys.version_info >= (3, 8):
def distributions(
*, context: None = ..., name: str | None = ..., path: list[str] = ..., **kwargs: Any
) -> Iterable[Distribution]: ...
def metadata(distribution_name: str) -> Message: ...

if sys.version_info >= (3, 10):
def metadata(distribution_name: str) -> PackageMetadata: ...
def entry_points() -> SelectableGroups: ...
Comment thread
srittau marked this conversation as resolved.
Outdated
else:
def metadata(distribution_name: str) -> Message: ...
def entry_points() -> dict[str, tuple[EntryPoint, ...]]: ...

def version(distribution_name: str) -> str: ...
def entry_points() -> dict[str, tuple[EntryPoint, ...]]: ...
def files(distribution_name: str) -> list[PackagePath] | None: ...
def requires(distribution_name: str) -> list[str] | None: ...