Skip to content

Commit f34f8d5

Browse files
authored
Merge pull request #8248 from McSinyx/ireq-get-direct
Fix typo and simplify ireq call
2 parents c74577e + 2994037 commit f34f8d5

File tree

4 files changed

+2
-7
lines changed

4 files changed

+2
-7
lines changed

news/86222709-663e-40a1-af2e-f20afab42122.trivial

Whitespace-only changes.

src/pip/_internal/resolution/resolvelib/candidates.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ def __init__(self, py_version_info):
461461
def name(self):
462462
# type: () -> str
463463
# Avoid conflicting with the PyPI package "Python".
464-
return "<Python fom Requires-Python>"
464+
return "<Python from Requires-Python>"
465465

466466
@property
467467
def version(self):

src/pip/_internal/resolution/resolvelib/provider.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
if MYPY_CHECK_RUNNING:
77
from typing import Any, Dict, Optional, Sequence, Set, Tuple, Union
88

9-
from pip._internal.req.req_install import InstallRequirement
109
from pip._vendor.packaging.version import _BaseVersion
1110

1211
from .base import Requirement, Candidate
@@ -105,10 +104,6 @@ def sort_key(c):
105104

106105
return sorted(matches, key=sort_key)
107106

108-
def get_install_requirement(self, c):
109-
# type: (Candidate) -> Optional[InstallRequirement]
110-
return c.get_install_requirement()
111-
112107
def identify(self, dependency):
113108
# type: (Union[Requirement, Candidate]) -> str
114109
return dependency.name

src/pip/_internal/resolution/resolvelib/resolver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def resolve(self, root_reqs, check_supported_wheels):
159159

160160
req_set = RequirementSet(check_supported_wheels=check_supported_wheels)
161161
for candidate in self._result.mapping.values():
162-
ireq = provider.get_install_requirement(candidate)
162+
ireq = candidate.get_install_requirement()
163163
if ireq is None:
164164
continue
165165
ireq.should_reinstall = self.factory.should_reinstall(candidate)

0 commit comments

Comments
 (0)