McSinyx/pip
1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00
Code Issues Releases Activity

Turn Candidate.get_dependencies() into iterable

Browse source 
This makes it easier to exclude dependencies when markers don't match.
This commit is contained in:
Tzu-ping Chung 2020-05-21 15:39:16 +08:00
parent 9999f0ec09
commit c3ac76f66c
3 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/pip/_internal/resolution/resolvelib/base.py
View file

@ -3,7 +3,7 @@ from pip._vendor.packaging.utils import canonicalize_name
from pip._internal.utils.typing import MYPY_CHECK_RUNNING from pip._internal.utils.typing import MYPY_CHECK_RUNNING
if MYPY_CHECK_RUNNING: if MYPY_CHECK_RUNNING:
from typing import Optional, Sequence, Set from typing import Iterable, Optional, Sequence, Set
from pip._internal.req.req_install import InstallRequirement from pip._internal.req.req_install import InstallRequirement
from pip._vendor.packaging.specifiers import SpecifierSet from pip._vendor.packaging.specifiers import SpecifierSet
@ -49,8 +49,8 @@ class Candidate(object):
# type: () -> bool # type: () -> bool
raise NotImplementedError("Override in subclass") raise NotImplementedError("Override in subclass")
def get_dependencies(self): def iter_dependencies(self):
# type: () -> Sequence[Requirement] # type: () -> Iterable[Requirement]
raise NotImplementedError("Override in subclass") raise NotImplementedError("Override in subclass")
def get_install_requirement(self): def get_install_requirement(self):

45
src/pip/_internal/resolution/resolvelib/candidates.py
View file

@ -17,7 +17,7 @@ from pip._internal.utils.typing import MYPY_CHECK_RUNNING
from .base import Candidate, format_name from .base import Candidate, format_name
if MYPY_CHECK_RUNNING: if MYPY_CHECK_RUNNING:
from typing import Any, Optional, Sequence, Set, Tuple, Union from typing import Any, Iterable, Optional, Set, Tuple, Union
from pip._vendor.packaging.version import _BaseVersion from pip._vendor.packaging.version import _BaseVersion
from pip._vendor.pkg_resources import Distribution from pip._vendor.pkg_resources import Distribution
@ -212,18 +212,15 @@ class _InstallRequirementBackedCandidate(Candidate):
return None return None
return spec return spec
def get_dependencies(self): def iter_dependencies(self):
# type: () -> Sequence[Requirement] # type: () -> Iterable[Requirement]
deps = [ for r in self.dist.requires():
self._factory.make_requirement_from_spec(str(r), self._ireq) yield self._factory.make_requirement_from_spec(str(r), self._ireq)
for r in self.dist.requires()
]
python_dep = self._factory.make_requires_python_requirement( python_dep = self._factory.make_requires_python_requirement(
self._get_requires_python_specifier(), self._get_requires_python_specifier(),
) )
if python_dep: if python_dep:
deps.append(python_dep) yield python_dep
return deps
def get_install_requirement(self): def get_install_requirement(self):
# type: () -> Optional[InstallRequirement] # type: () -> Optional[InstallRequirement]
@ -326,12 +323,10 @@ class AlreadyInstalledCandidate(Candidate):
# type: () -> _BaseVersion # type: () -> _BaseVersion
return self.dist.parsed_version return self.dist.parsed_version
def get_dependencies(self): def iter_dependencies(self):
# type: () -> Sequence[Requirement] # type: () -> Iterable[Requirement]
return [ for r in self.dist.requires():
self._factory.make_requirement_from_spec(str(r), self._ireq) yield self._factory.make_requirement_from_spec(str(r), self._ireq)
for r in self.dist.requires()
]
def get_install_requirement(self): def get_install_requirement(self):
# type: () -> Optional[InstallRequirement] # type: () -> Optional[InstallRequirement]
@ -406,8 +401,8 @@ class ExtrasCandidate(Candidate):
# type: () -> _BaseVersion # type: () -> _BaseVersion
return self.base.is_installed return self.base.is_installed
def get_dependencies(self): def iter_dependencies(self):
# type: () -> Sequence[Requirement] # type: () -> Iterable[Requirement]
factory = self.base._factory factory = self.base._factory
# The user may have specified extras that the candidate doesn't # The user may have specified extras that the candidate doesn't
@ -422,17 +417,15 @@ class ExtrasCandidate(Candidate):
extra extra
) )
deps = [ for r in self.base.dist.requires(valid_extras):
factory.make_requirement_from_spec(str(r), self.base._ireq) yield factory.make_requirement_from_spec(str(r), self.base._ireq)
for r in self.base.dist.requires(valid_extras)
]
# Add a dependency on the exact base. # Add a dependency on the exact base.
# (See note 2b in the class docstring) # (See note 2b in the class docstring)
# FIXME: This does not work if the base candidate is specified by # FIXME: This does not work if the base candidate is specified by
# link, e.g. "pip install .[dev]" will fail. # link, e.g. "pip install .[dev]" will fail.
spec = "{}=={}".format(self.base.name, self.base.version) spec = "{}=={}".format(self.base.name, self.base.version)
deps.append(factory.make_requirement_from_spec(spec, self.base._ireq)) yield factory.make_requirement_from_spec(spec, self.base._ireq)
return deps
def get_install_requirement(self): def get_install_requirement(self):
# type: () -> Optional[InstallRequirement] # type: () -> Optional[InstallRequirement]
@ -468,9 +461,9 @@ class RequiresPythonCandidate(Candidate):
# type: () -> _BaseVersion # type: () -> _BaseVersion
return self._version return self._version
def get_dependencies(self): def iter_dependencies(self):
# type: () -> Sequence[Requirement] # type: () -> Iterable[Requirement]
return [] return ()
def get_install_requirement(self): def get_install_requirement(self):
# type: () -> Optional[InstallRequirement] # type: () -> Optional[InstallRequirement]

2
src/pip/_internal/resolution/resolvelib/provider.py
View file

@ -132,4 +132,4 @@ class PipProvider(AbstractProvider):
# type: (Candidate) -> Sequence[Requirement] # type: (Candidate) -> Sequence[Requirement]
if self._ignore_dependencies: if self._ignore_dependencies:
return [] return []
return candidate.get_dependencies() return list(candidate.iter_dependencies())