Skip to content

Commit a34332a

Browse files
committed
Separate req set creation into a new method
1 parent a8edffd commit a34332a

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

news/5a7a341b-ca90-476b-8d4b-c40cef58b444.trivial

Whitespace-only changes.

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from .factory import Factory
1818

1919
if MYPY_CHECK_RUNNING:
20-
from typing import Dict, List, Optional, Set, Tuple
20+
from typing import Dict, Iterable, List, Optional, Set, Tuple
2121

2222
from pip._vendor.packaging.specifiers import SpecifierSet
2323
from pip._vendor.resolvelib.resolvers import Result
@@ -28,6 +28,7 @@
2828
from pip._internal.operations.prepare import RequirementPreparer
2929
from pip._internal.req.req_install import InstallRequirement
3030
from pip._internal.resolution.base import InstallRequirementProvider
31+
from pip._internal.resolution.resolvelib.base import Candidate
3132

3233

3334
logger = logging.getLogger(__name__)
@@ -120,13 +121,16 @@ def resolve(self, root_reqs, check_supported_wheels):
120121
self._result = resolver.resolve(
121122
requirements, max_rounds=try_to_avoid_resolution_too_deep,
122123
)
123-
124124
except ResolutionImpossible as e:
125125
error = self.factory.get_installation_error(e)
126126
six.raise_from(error, e)
127127

128+
return self._make_req_set(self._result.mapping.values())
129+
130+
def _make_req_set(self, candidates):
131+
# type: (Iterable[Candidate]) -> RequirementSet
128132
req_set = RequirementSet(check_supported_wheels=check_supported_wheels)
129-
for candidate in self._result.mapping.values():
133+
for candidate in candidates:
130134
ireq = candidate.get_install_requirement()
131135
if ireq is None:
132136
continue

0 commit comments

Comments
 (0)