Skip to content

Commit 35df2bf

Browse files
committed
Use lazy wheel to obtain dep info for new resolver
1 parent 02a1092 commit 35df2bf

File tree

6 files changed

+60
-16
lines changed

6 files changed

+60
-16
lines changed

news/8588.feature

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Allow the new resolver to obtain dependency information through wheels
2+
lazily downloaded using HTTP range requests. To enable this feature,
3+
invoke ``pip`` with ``--use-feature=fast-deps``.

src/pip/_internal/cli/cmdoptions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ def check_list_path_option(options):
916916
metavar='feature',
917917
action='append',
918918
default=[],
919-
choices=['2020-resolver'],
919+
choices=['2020-resolver', 'fast-deps'],
920920
help='Enable new functionality, that may be backward incompatible.',
921921
) # type: Callable[..., Option]
922922

src/pip/_internal/cli/req_command.py

+1
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ def make_resolver(
271271
force_reinstall=force_reinstall,
272272
upgrade_strategy=upgrade_strategy,
273273
py_version_info=py_version_info,
274+
lazy_wheel='fast-deps' in options.features_enabled,
274275
)
275276
import pip._internal.resolution.legacy.resolver
276277
return pip._internal.resolution.legacy.resolver.Resolver(

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

+44-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
import logging
22
import sys
33

4+
from pip._vendor.contextlib2 import suppress
45
from pip._vendor.packaging.specifiers import InvalidSpecifier, SpecifierSet
56
from pip._vendor.packaging.utils import canonicalize_name
67
from pip._vendor.packaging.version import Version
78

89
from pip._internal.exceptions import HashError, MetadataInconsistent
10+
from pip._internal.network.lazy_wheel import dist_from_wheel_url
911
from pip._internal.req.constructors import (
1012
install_req_from_editable,
1113
install_req_from_line,
1214
)
1315
from pip._internal.req.req_install import InstallRequirement
16+
from pip._internal.utils.logging import indent_log
1417
from pip._internal.utils.misc import dist_is_editable, normalize_version_info
1518
from pip._internal.utils.packaging import get_requires_python
1619
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
@@ -142,6 +145,7 @@ def __init__(
142145
self._name = name
143146
self._version = version
144147
self._dist = None # type: Optional[Distribution]
148+
self._prepared = False
145149

146150
def __repr__(self):
147151
# type: () -> str
@@ -197,11 +201,23 @@ def _prepare_abstract_distribution(self):
197201
# type: () -> AbstractDistribution
198202
raise NotImplementedError("Override in subclass")
199203

204+
def _check_metadata_consistency(self):
205+
# type: () -> None
206+
"""Check for consistency of project name and version of dist."""
207+
# TODO: (Longer term) Rather than abort, reject this candidate
208+
# and backtrack. This would need resolvelib support.
209+
dist = self._dist # type: Distribution
210+
name = canonicalize_name(dist.project_name)
211+
if self._name is not None and self._name != name:
212+
raise MetadataInconsistent(self._ireq, "name", dist.project_name)
213+
version = dist.parsed_version
214+
if self._version is not None and self._version != version:
215+
raise MetadataInconsistent(self._ireq, "version", dist.version)
216+
200217
def _prepare(self):
201218
# type: () -> None
202-
if self._dist is not None:
219+
if self._prepared:
203220
return
204-
205221
try:
206222
abstract_dist = self._prepare_abstract_distribution()
207223
except HashError as e:
@@ -210,24 +226,37 @@ def _prepare(self):
210226

211227
self._dist = abstract_dist.get_pkg_resources_distribution()
212228
assert self._dist is not None, "Distribution already installed"
229+
self._check_metadata_consistency()
230+
self._prepared = True
213231

214-
# TODO: (Longer term) Rather than abort, reject this candidate
215-
# and backtrack. This would need resolvelib support.
216-
name = canonicalize_name(self._dist.project_name)
217-
if self._name is not None and self._name != name:
218-
raise MetadataInconsistent(
219-
self._ireq, "name", self._dist.project_name,
220-
)
221-
version = self._dist.parsed_version
222-
if self._version is not None and self._version != version:
223-
raise MetadataInconsistent(
224-
self._ireq, "version", self._dist.version,
225-
)
232+
def _fetch_metadata(self):
233+
# type: () -> None
234+
"""Fetch metadata, using lazy wheel if possible."""
235+
preparer = self._factory.preparer
236+
use_lazy_wheel = self._factory.use_lazy_wheel
237+
remote_wheel = self._link.is_wheel and not self._link.is_file
238+
if use_lazy_wheel and remote_wheel and not preparer.require_hashes:
239+
assert self._name is not None
240+
logger.info('Collecting %s', self._ireq.req or self._ireq)
241+
# TODO: Rename to HTTPRangeRequestUnsupported (GH-8584)
242+
# If RuntimeError is raised, fallback to self._prepare
243+
with indent_log(), suppress(RuntimeError):
244+
logger.info(
245+
'Obtaining dependency information from %s %s',
246+
self._name, self._version,
247+
)
248+
url = self._link.url.split('#', 1)[0]
249+
session = preparer.downloader._session
250+
self._dist = dist_from_wheel_url(self._name, url, session)
251+
self._check_metadata_consistency()
252+
if self._dist is None:
253+
self._prepare()
226254

227255
@property
228256
def dist(self):
229257
# type: () -> Distribution
230-
self._prepare()
258+
if self._dist is None:
259+
self._fetch_metadata()
231260
return self._dist
232261

233262
def _get_requires_python_specifier(self):

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

+2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ def __init__(
8282
ignore_installed, # type: bool
8383
ignore_requires_python, # type: bool
8484
py_version_info=None, # type: Optional[Tuple[int, ...]]
85+
lazy_wheel=False, # type: bool
8586
):
8687
# type: (...) -> None
8788
self._finder = finder
@@ -92,6 +93,7 @@ def __init__(
9293
self._use_user_site = use_user_site
9394
self._force_reinstall = force_reinstall
9495
self._ignore_requires_python = ignore_requires_python
96+
self.use_lazy_wheel = lazy_wheel
9597

9698
self._link_candidate_cache = {} # type: Cache[LinkCandidate]
9799
self._editable_candidate_cache = {} # type: Cache[EditableCandidate]

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

+9
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,16 @@ def __init__(
4949
force_reinstall, # type: bool
5050
upgrade_strategy, # type: str
5151
py_version_info=None, # type: Optional[Tuple[int, ...]]
52+
lazy_wheel=False, # type: bool
5253
):
5354
super(Resolver, self).__init__()
55+
if lazy_wheel:
56+
logger.warning(
57+
'pip is using lazily downloaded wheels using HTTP '
58+
'range requests to obtain dependency information. '
59+
'This experimental feature is enabled through '
60+
'--use-feature=fast-deps and it is not ready for production.'
61+
)
5462

5563
assert upgrade_strategy in self._allowed_strategies
5664

@@ -64,6 +72,7 @@ def __init__(
6472
ignore_installed=ignore_installed,
6573
ignore_requires_python=ignore_requires_python,
6674
py_version_info=py_version_info,
75+
lazy_wheel=lazy_wheel,
6776
)
6877
self.ignore_dependencies = ignore_dependencies
6978
self.upgrade_strategy = upgrade_strategy

0 commit comments

Comments
 (0)