diff --git a/news/10074.trivial.rst b/news/10074.trivial.rst new file mode 100644 index 00000000000..2f844d92171 --- /dev/null +++ b/news/10074.trivial.rst @@ -0,0 +1 @@ +Fixed all the annotations from ``pip/_internal/distributions``. diff --git a/src/pip/_internal/distributions/__init__.py b/src/pip/_internal/distributions/__init__.py index a222f248f34..9a89a838b9a 100644 --- a/src/pip/_internal/distributions/__init__.py +++ b/src/pip/_internal/distributions/__init__.py @@ -4,8 +4,9 @@ from pip._internal.req.req_install import InstallRequirement -def make_distribution_for_install_requirement(install_req): - # type: (InstallRequirement) -> AbstractDistribution +def make_distribution_for_install_requirement( + install_req: InstallRequirement, +) -> AbstractDistribution: """Returns a Distribution for the given InstallRequirement""" # Editable requirements will always be source distributions. They use the # legacy logic until we create a modern standard for them. diff --git a/src/pip/_internal/distributions/base.py b/src/pip/_internal/distributions/base.py index 78ee91e76f1..fbdd5e41154 100644 --- a/src/pip/_internal/distributions/base.py +++ b/src/pip/_internal/distributions/base.py @@ -23,17 +23,16 @@ class AbstractDistribution(metaclass=abc.ABCMeta): above metadata. """ - def __init__(self, req): - # type: (InstallRequirement) -> None + def __init__(self, req: InstallRequirement) -> None: super().__init__() self.req = req @abc.abstractmethod - def get_pkg_resources_distribution(self): - # type: () -> Optional[Distribution] + def get_pkg_resources_distribution(self) -> Optional[Distribution]: raise NotImplementedError() @abc.abstractmethod - def prepare_distribution_metadata(self, finder, build_isolation): - # type: (PackageFinder, bool) -> None + def prepare_distribution_metadata( + self, finder: PackageFinder, build_isolation: bool + ) -> None: raise NotImplementedError() diff --git a/src/pip/_internal/distributions/installed.py b/src/pip/_internal/distributions/installed.py index b19dfacb4db..0d452e27f35 100644 --- a/src/pip/_internal/distributions/installed.py +++ b/src/pip/_internal/distributions/installed.py @@ -13,10 +13,10 @@ class InstalledDistribution(AbstractDistribution): been computed. """ - def get_pkg_resources_distribution(self): - # type: () -> Optional[Distribution] + def get_pkg_resources_distribution(self) -> Optional[Distribution]: return self.req.satisfied_by - def prepare_distribution_metadata(self, finder, build_isolation): - # type: (PackageFinder, bool) -> None + def prepare_distribution_metadata( + self, finder: PackageFinder, build_isolation: bool + ) -> None: pass diff --git a/src/pip/_internal/distributions/sdist.py b/src/pip/_internal/distributions/sdist.py index c873a9f10e1..596b516a5b6 100644 --- a/src/pip/_internal/distributions/sdist.py +++ b/src/pip/_internal/distributions/sdist.py @@ -19,12 +19,12 @@ class SourceDistribution(AbstractDistribution): generated, either using PEP 517 or using the legacy `setup.py egg_info`. """ - def get_pkg_resources_distribution(self): - # type: () -> Distribution + def get_pkg_resources_distribution(self) -> Distribution: return self.req.get_dist() - def prepare_distribution_metadata(self, finder, build_isolation): - # type: (PackageFinder, bool) -> None + def prepare_distribution_metadata( + self, finder: PackageFinder, build_isolation: bool + ) -> None: # Load pyproject.toml, to determine whether PEP 517 is to be used self.req.load_pyproject_toml() @@ -35,10 +35,10 @@ def prepare_distribution_metadata(self, finder, build_isolation): self.req.prepare_metadata() - def _setup_isolation(self, finder): - # type: (PackageFinder) -> None - def _raise_conflicts(conflicting_with, conflicting_reqs): - # type: (str, Set[Tuple[str, str]]) -> None + def _setup_isolation(self, finder: PackageFinder) -> None: + def _raise_conflicts( + conflicting_with: str, conflicting_reqs: Set[Tuple[str, str]] + ) -> None: format_string = ( "Some build dependencies for {requirement} " "conflict with {conflicting_with}: {description}." diff --git a/src/pip/_internal/distributions/wheel.py b/src/pip/_internal/distributions/wheel.py index d0384797b46..00a70b02dc3 100644 --- a/src/pip/_internal/distributions/wheel.py +++ b/src/pip/_internal/distributions/wheel.py @@ -13,8 +13,7 @@ class WheelDistribution(AbstractDistribution): This does not need any preparation as wheels can be directly unpacked. """ - def get_pkg_resources_distribution(self): - # type: () -> Distribution + def get_pkg_resources_distribution(self) -> Distribution: """Loads the metadata from the wheel file into memory and returns a Distribution that uses it, not relying on the wheel file or requirement. @@ -29,6 +28,7 @@ def get_pkg_resources_distribution(self): z, self.req.name, self.req.local_file_path ) - def prepare_distribution_metadata(self, finder, build_isolation): - # type: (PackageFinder, bool) -> None + def prepare_distribution_metadata( + self, finder: PackageFinder, build_isolation: bool + ) -> None: pass