McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Flip the flag with another name

This commit is contained in:
Tzu-ping Chung 2020-08-03 05:28:10 +08:00
parent 77cedcf52f
commit 32b5e43c79
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pip/_internal/resolution/resolvelib/base.py
View File

@ -69,7 +69,7 @@ class Candidate(object):
# type: () -> Optional[Link]
raise NotImplementedError("Override in subclass")
def iter_dependencies(self, ignore_dependencies):
def iter_dependencies(self, with_requires):
# type: (bool) -> Iterable[Optional[Requirement]]
raise NotImplementedError("Override in subclass")

14
src/pip/_internal/resolution/resolvelib/candidates.py
View File

@ -275,9 +275,9 @@ class _InstallRequirementBackedCandidate(Candidate):
return None
return spec
def iter_dependencies(self, ignore_dependencies):
def iter_dependencies(self, with_requires):
# type: (bool) -> Iterable[Optional[Requirement]]
if ignore_dependencies:
if not with_requires:
return
for r in self.dist.requires():
yield self._factory.make_requirement_from_spec(str(r), self._ireq)
@ -422,9 +422,9 @@ class AlreadyInstalledCandidate(Candidate):
# type: () -> str
return "{} {} (Installed)".format(self.name, self.version)
def iter_dependencies(self, ignore_dependencies):
def iter_dependencies(self, with_requires):
# type: (bool) -> Iterable[Optional[Requirement]]
if ignore_dependencies:
if not with_requires:
return
for r in self.dist.requires():
yield self._factory.make_requirement_from_spec(str(r), self._ireq)
@ -523,14 +523,14 @@ class ExtrasCandidate(Candidate):
# type: () -> Optional[Link]
return self.base.source_link
def iter_dependencies(self, ignore_dependencies):
def iter_dependencies(self, with_requires):
# type: (bool) -> Iterable[Optional[Requirement]]
factory = self.base._factory
# Add a dependency on the exact base
# (See note 2b in the class docstring)
yield factory.make_requirement_from_candidate(self.base)
if ignore_dependencies:
if not with_requires:
return
# The user may have specified extras that the candidate doesn't
@ -591,7 +591,7 @@ class RequiresPythonCandidate(Candidate):
# type: () -> str
return "Python {}".format(self.version)
def iter_dependencies(self, ignore_dependencies):
def iter_dependencies(self, with_requires):
# type: (bool) -> Iterable[Optional[Requirement]]
return ()

3
src/pip/_internal/resolution/resolvelib/provider.py
View File

@ -145,8 +145,9 @@ class PipProvider(AbstractProvider):
def get_dependencies(self, candidate):
# type: (Candidate) -> Sequence[Requirement]
with_requires = not self._ignore_dependencies
return [
r
for r in candidate.iter_dependencies(self._ignore_dependencies)
for r in candidate.iter_dependencies(with_requires)
if r is not None
]