Merge pull request #12163 from pfmoore/fix_12156

Disable PEP 658 for the legacy resolver
This commit is contained in:
Paul Moore 2023-07-21 15:13:14 +01:00 committed by GitHub
commit 1d4674c389
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 0 deletions

1
news/12156.bugfix.rst Normal file
View File

@ -0,0 +1 @@
Disable PEP 658 metadata fetching with the legacy resolver.

View File

@ -287,6 +287,7 @@ class RequirementCommand(IndexGroupCommand):
"""
temp_build_dir_path = temp_build_dir.path
assert temp_build_dir_path is not None
legacy_resolver = False
resolver_variant = cls.determine_resolver_variant(options)
if resolver_variant == "2020-resolver":
@ -300,6 +301,7 @@ class RequirementCommand(IndexGroupCommand):
"production."
)
else:
legacy_resolver = True
lazy_wheel = False
if "fast-deps" in options.features_enabled:
logger.warning(
@ -320,6 +322,7 @@ class RequirementCommand(IndexGroupCommand):
use_user_site=use_user_site,
lazy_wheel=lazy_wheel,
verbosity=verbosity,
legacy_resolver=legacy_resolver,
)
@classmethod

View File

@ -226,6 +226,7 @@ class RequirementPreparer:
use_user_site: bool,
lazy_wheel: bool,
verbosity: int,
legacy_resolver: bool,
) -> None:
super().__init__()
@ -259,6 +260,9 @@ class RequirementPreparer:
# How verbose should underlying tooling be?
self.verbosity = verbosity
# Are we using the legacy resolver?
self.legacy_resolver = legacy_resolver
# Memoized downloaded files, as mapping of url: path.
self._downloaded: Dict[str, str] = {}
@ -365,6 +369,11 @@ class RequirementPreparer:
self,
req: InstallRequirement,
) -> Optional[BaseDistribution]:
if self.legacy_resolver:
logger.debug(
"Metadata-only fetching is not used in the legacy resolver",
)
return None
if self.require_hashes:
logger.debug(
"Metadata-only fetching is not used as hash checking is required",

View File

@ -105,6 +105,7 @@ class TestRequirementSet:
use_user_site=False,
lazy_wheel=False,
verbosity=0,
legacy_resolver=True,
)
yield Resolver(
preparer=preparer,