From 4bc81e3c24ef8a36d3f538ef856870b612ef6a3d Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 26 Mar 2022 10:02:24 +0000 Subject: [PATCH 1/5] Rename `RequirementTracker` to `BuildTracker` --- src/pip/_internal/cli/req_command.py | 4 ++-- src/pip/_internal/operations/prepare.py | 6 +++--- src/pip/_internal/req/req_tracker.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py index 5d4d1f0f45b..2e85d12fc09 100644 --- a/src/pip/_internal/cli/req_command.py +++ b/src/pip/_internal/cli/req_command.py @@ -31,7 +31,7 @@ ) from pip._internal.req.req_file import parse_requirements from pip._internal.req.req_install import InstallRequirement -from pip._internal.req.req_tracker import RequirementTracker +from pip._internal.req.req_tracker import BuildTracker from pip._internal.resolution.base import BaseResolver from pip._internal.self_outdated_check import pip_self_version_check from pip._internal.utils.deprecation import deprecated @@ -257,7 +257,7 @@ def make_requirement_preparer( cls, temp_build_dir: TempDirectory, options: Values, - req_tracker: RequirementTracker, + req_tracker: BuildTracker, session: PipSession, finder: PackageFinder, use_user_site: bool, diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py index a726f031a4f..4e3a60dde78 100644 --- a/src/pip/_internal/operations/prepare.py +++ b/src/pip/_internal/operations/prepare.py @@ -34,7 +34,7 @@ ) from pip._internal.network.session import PipSession from pip._internal.req.req_install import InstallRequirement -from pip._internal.req.req_tracker import RequirementTracker +from pip._internal.req.req_tracker import BuildTracker from pip._internal.utils.filesystem import copy2_fixed from pip._internal.utils.hashes import Hashes, MissingHashes from pip._internal.utils.logging import indent_log @@ -48,7 +48,7 @@ def _get_prepared_distribution( req: InstallRequirement, - req_tracker: RequirementTracker, + req_tracker: BuildTracker, finder: PackageFinder, build_isolation: bool, ) -> BaseDistribution: @@ -261,7 +261,7 @@ def __init__( download_dir: Optional[str], src_dir: str, build_isolation: bool, - req_tracker: RequirementTracker, + req_tracker: BuildTracker, session: PipSession, progress_bar: str, finder: PackageFinder, diff --git a/src/pip/_internal/req/req_tracker.py b/src/pip/_internal/req/req_tracker.py index 24d3c530335..58ec96f02b4 100644 --- a/src/pip/_internal/req/req_tracker.py +++ b/src/pip/_internal/req/req_tracker.py @@ -39,7 +39,7 @@ def update_env_context_manager(**changes: str) -> Iterator[None]: @contextlib.contextmanager -def get_requirement_tracker() -> Iterator["RequirementTracker"]: +def get_requirement_tracker() -> Iterator["BuildTracker"]: root = os.environ.get("PIP_REQ_TRACKER") with contextlib.ExitStack() as ctx: if root is None: @@ -47,17 +47,17 @@ def get_requirement_tracker() -> Iterator["RequirementTracker"]: ctx.enter_context(update_env_context_manager(PIP_REQ_TRACKER=root)) logger.debug("Initialized build tracking at %s", root) - with RequirementTracker(root) as tracker: + with BuildTracker(root) as tracker: yield tracker -class RequirementTracker: +class BuildTracker: def __init__(self, root: str) -> None: self._root = root self._entries: Set[InstallRequirement] = set() logger.debug("Created build tracker: %s", self._root) - def __enter__(self) -> "RequirementTracker": + def __enter__(self) -> "BuildTracker": logger.debug("Entered build tracker: %s", self._root) return self From cbfcbd2d947496ec946e4bc4542b67f2aabb3071 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 26 Mar 2022 10:04:35 +0000 Subject: [PATCH 2/5] Rename get_{requirement -> build}_tracker --- src/pip/_internal/commands/download.py | 4 ++-- src/pip/_internal/commands/install.py | 4 ++-- src/pip/_internal/commands/wheel.py | 4 ++-- src/pip/_internal/req/req_tracker.py | 2 +- tests/unit/resolution_resolvelib/conftest.py | 4 ++-- tests/unit/test_req.py | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/pip/_internal/commands/download.py b/src/pip/_internal/commands/download.py index 233b7e983fa..d4efbebadbb 100644 --- a/src/pip/_internal/commands/download.py +++ b/src/pip/_internal/commands/download.py @@ -7,7 +7,7 @@ from pip._internal.cli.cmdoptions import make_target_python from pip._internal.cli.req_command import RequirementCommand, with_cleanup from pip._internal.cli.status_codes import SUCCESS -from pip._internal.req.req_tracker import get_requirement_tracker +from pip._internal.req.req_tracker import get_build_tracker from pip._internal.utils.misc import ensure_dir, normalize_path, write_output from pip._internal.utils.temp_dir import TempDirectory @@ -95,7 +95,7 @@ def run(self, options: Values, args: List[str]) -> int: ignore_requires_python=options.ignore_requires_python, ) - req_tracker = self.enter_context(get_requirement_tracker()) + req_tracker = self.enter_context(get_build_tracker()) directory = TempDirectory( delete=not options.no_clean, diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py index 34e4c2f84c8..c094ded1550 100644 --- a/src/pip/_internal/commands/install.py +++ b/src/pip/_internal/commands/install.py @@ -24,7 +24,7 @@ from pip._internal.operations.check import ConflictDetails, check_install_conflicts from pip._internal.req import install_given_reqs from pip._internal.req.req_install import InstallRequirement -from pip._internal.req.req_tracker import get_requirement_tracker +from pip._internal.req.req_tracker import get_build_tracker from pip._internal.utils.compat import WINDOWS from pip._internal.utils.distutils_args import parse_distutils_args from pip._internal.utils.filesystem import test_writable_dir @@ -293,7 +293,7 @@ def run(self, options: Values, args: List[str]) -> int: ) wheel_cache = WheelCache(options.cache_dir, options.format_control) - req_tracker = self.enter_context(get_requirement_tracker()) + req_tracker = self.enter_context(get_build_tracker()) directory = TempDirectory( delete=not options.no_clean, diff --git a/src/pip/_internal/commands/wheel.py b/src/pip/_internal/commands/wheel.py index fd4fab4fd66..3b5cb03779e 100644 --- a/src/pip/_internal/commands/wheel.py +++ b/src/pip/_internal/commands/wheel.py @@ -10,7 +10,7 @@ from pip._internal.cli.status_codes import SUCCESS from pip._internal.exceptions import CommandError from pip._internal.req.req_install import InstallRequirement -from pip._internal.req.req_tracker import get_requirement_tracker +from pip._internal.req.req_tracker import get_build_tracker from pip._internal.utils.misc import ensure_dir, normalize_path from pip._internal.utils.temp_dir import TempDirectory from pip._internal.wheel_builder import build, should_build_for_wheel_command @@ -108,7 +108,7 @@ def run(self, options: Values, args: List[str]) -> int: options.wheel_dir = normalize_path(options.wheel_dir) ensure_dir(options.wheel_dir) - req_tracker = self.enter_context(get_requirement_tracker()) + req_tracker = self.enter_context(get_build_tracker()) directory = TempDirectory( delete=not options.no_clean, diff --git a/src/pip/_internal/req/req_tracker.py b/src/pip/_internal/req/req_tracker.py index 58ec96f02b4..7b3691ff9b7 100644 --- a/src/pip/_internal/req/req_tracker.py +++ b/src/pip/_internal/req/req_tracker.py @@ -39,7 +39,7 @@ def update_env_context_manager(**changes: str) -> Iterator[None]: @contextlib.contextmanager -def get_requirement_tracker() -> Iterator["BuildTracker"]: +def get_build_tracker() -> Iterator["BuildTracker"]: root = os.environ.get("PIP_REQ_TRACKER") with contextlib.ExitStack() as ctx: if root is None: diff --git a/tests/unit/resolution_resolvelib/conftest.py b/tests/unit/resolution_resolvelib/conftest.py index 545ed7c3506..178be2e9e15 100644 --- a/tests/unit/resolution_resolvelib/conftest.py +++ b/tests/unit/resolution_resolvelib/conftest.py @@ -13,7 +13,7 @@ from pip._internal.network.session import PipSession from pip._internal.operations.prepare import RequirementPreparer from pip._internal.req.constructors import install_req_from_line -from pip._internal.req.req_tracker import get_requirement_tracker +from pip._internal.req.req_tracker import get_build_tracker from pip._internal.resolution.resolvelib.factory import Factory from pip._internal.resolution.resolvelib.provider import PipProvider from pip._internal.utils.temp_dir import TempDirectory, global_tempdir_manager @@ -38,7 +38,7 @@ def preparer(finder: PackageFinder) -> Iterator[RequirementPreparer]: with global_tempdir_manager(): with TempDirectory() as tmp: - with get_requirement_tracker() as tracker: + with get_build_tracker() as tracker: preparer = RequirementCommand.make_requirement_preparer( tmp, options=o[0], diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py index 858695c1ff9..8ceaa9b206a 100644 --- a/tests/unit/test_req.py +++ b/tests/unit/test_req.py @@ -39,7 +39,7 @@ get_line_parser, handle_requirement_line, ) -from pip._internal.req.req_tracker import get_requirement_tracker +from pip._internal.req.req_tracker import get_build_tracker from pip._internal.resolution.legacy.resolver import Resolver from pip._internal.utils.urls import path_to_url from tests.lib import TestData, make_test_finder, requirements_file @@ -85,7 +85,7 @@ def _basic_resolver( ) session = PipSession() - with get_requirement_tracker() as tracker: + with get_build_tracker() as tracker: preparer = RequirementPreparer( build_dir=os.path.join(self.tempdir, "build"), src_dir=os.path.join(self.tempdir, "src"), From 62516b8ad334e81212d63635c7e8593adb21d3cf Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 26 Mar 2022 10:04:54 +0000 Subject: [PATCH 3/5] Rename PIP_{REQ -> BUILD}_TRACKER --- src/pip/_internal/req/req_tracker.py | 6 +++--- tests/conftest.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pip/_internal/req/req_tracker.py b/src/pip/_internal/req/req_tracker.py index 7b3691ff9b7..d6574f2ca17 100644 --- a/src/pip/_internal/req/req_tracker.py +++ b/src/pip/_internal/req/req_tracker.py @@ -40,11 +40,11 @@ def update_env_context_manager(**changes: str) -> Iterator[None]: @contextlib.contextmanager def get_build_tracker() -> Iterator["BuildTracker"]: - root = os.environ.get("PIP_REQ_TRACKER") + root = os.environ.get("PIP_BUILD_TRACKER") with contextlib.ExitStack() as ctx: if root is None: - root = ctx.enter_context(TempDirectory(kind="req-tracker")).path - ctx.enter_context(update_env_context_manager(PIP_REQ_TRACKER=root)) + root = ctx.enter_context(TempDirectory(kind="build-tracker")).path + ctx.enter_context(update_env_context_manager(PIP_BUILD_TRACKER=root)) logger.debug("Initialized build tracking at %s", root) with BuildTracker(root) as tracker: diff --git a/tests/conftest.py b/tests/conftest.py index 04b1b6e7058..c137f844129 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -271,7 +271,7 @@ def isolate(tmpdir: Path, monkeypatch: pytest.MonkeyPatch) -> None: monkeypatch.setenv("PIP_DISABLE_PIP_VERSION_CHECK", "true") # Make sure tests don't share a requirements tracker. - monkeypatch.delenv("PIP_REQ_TRACKER", False) + monkeypatch.delenv("PIP_BUILD_TRACKER", False) # FIXME: Windows... os.makedirs(os.path.join(home_dir, ".config", "git")) From e5542dc024e916569226e1cd29e49d9384eed466 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 26 Mar 2022 10:07:21 +0000 Subject: [PATCH 4/5] Move `BuildTracker` to `operations.build.build_tracker` --- src/pip/_internal/cli/req_command.py | 2 +- src/pip/_internal/commands/download.py | 2 +- src/pip/_internal/commands/install.py | 2 +- src/pip/_internal/commands/wheel.py | 2 +- .../{req/req_tracker.py => operations/build/build_tracker.py} | 0 src/pip/_internal/operations/prepare.py | 2 +- tests/unit/resolution_resolvelib/conftest.py | 2 +- tests/unit/test_req.py | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename src/pip/_internal/{req/req_tracker.py => operations/build/build_tracker.py} (100%) diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py index 2e85d12fc09..b76684135b5 100644 --- a/src/pip/_internal/cli/req_command.py +++ b/src/pip/_internal/cli/req_command.py @@ -22,6 +22,7 @@ from pip._internal.models.selection_prefs import SelectionPreferences from pip._internal.models.target_python import TargetPython from pip._internal.network.session import PipSession +from pip._internal.operations.build.build_tracker import BuildTracker from pip._internal.operations.prepare import RequirementPreparer from pip._internal.req.constructors import ( install_req_from_editable, @@ -31,7 +32,6 @@ ) from pip._internal.req.req_file import parse_requirements from pip._internal.req.req_install import InstallRequirement -from pip._internal.req.req_tracker import BuildTracker from pip._internal.resolution.base import BaseResolver from pip._internal.self_outdated_check import pip_self_version_check from pip._internal.utils.deprecation import deprecated diff --git a/src/pip/_internal/commands/download.py b/src/pip/_internal/commands/download.py index d4efbebadbb..5287276d782 100644 --- a/src/pip/_internal/commands/download.py +++ b/src/pip/_internal/commands/download.py @@ -7,7 +7,7 @@ from pip._internal.cli.cmdoptions import make_target_python from pip._internal.cli.req_command import RequirementCommand, with_cleanup from pip._internal.cli.status_codes import SUCCESS -from pip._internal.req.req_tracker import get_build_tracker +from pip._internal.operations.build.build_tracker import get_build_tracker from pip._internal.utils.misc import ensure_dir, normalize_path, write_output from pip._internal.utils.temp_dir import TempDirectory diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py index c094ded1550..431068cb090 100644 --- a/src/pip/_internal/commands/install.py +++ b/src/pip/_internal/commands/install.py @@ -21,10 +21,10 @@ from pip._internal.locations import get_scheme from pip._internal.metadata import get_environment from pip._internal.models.format_control import FormatControl +from pip._internal.operations.build.build_tracker import get_build_tracker from pip._internal.operations.check import ConflictDetails, check_install_conflicts from pip._internal.req import install_given_reqs from pip._internal.req.req_install import InstallRequirement -from pip._internal.req.req_tracker import get_build_tracker from pip._internal.utils.compat import WINDOWS from pip._internal.utils.distutils_args import parse_distutils_args from pip._internal.utils.filesystem import test_writable_dir diff --git a/src/pip/_internal/commands/wheel.py b/src/pip/_internal/commands/wheel.py index 3b5cb03779e..47cc8b00690 100644 --- a/src/pip/_internal/commands/wheel.py +++ b/src/pip/_internal/commands/wheel.py @@ -9,8 +9,8 @@ from pip._internal.cli.req_command import RequirementCommand, with_cleanup from pip._internal.cli.status_codes import SUCCESS from pip._internal.exceptions import CommandError +from pip._internal.operations.build.build_tracker import get_build_tracker from pip._internal.req.req_install import InstallRequirement -from pip._internal.req.req_tracker import get_build_tracker from pip._internal.utils.misc import ensure_dir, normalize_path from pip._internal.utils.temp_dir import TempDirectory from pip._internal.wheel_builder import build, should_build_for_wheel_command diff --git a/src/pip/_internal/req/req_tracker.py b/src/pip/_internal/operations/build/build_tracker.py similarity index 100% rename from src/pip/_internal/req/req_tracker.py rename to src/pip/_internal/operations/build/build_tracker.py diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py index 4e3a60dde78..cfa6b665e1d 100644 --- a/src/pip/_internal/operations/prepare.py +++ b/src/pip/_internal/operations/prepare.py @@ -33,8 +33,8 @@ dist_from_wheel_url, ) from pip._internal.network.session import PipSession +from pip._internal.operations.build.build_tracker import BuildTracker from pip._internal.req.req_install import InstallRequirement -from pip._internal.req.req_tracker import BuildTracker from pip._internal.utils.filesystem import copy2_fixed from pip._internal.utils.hashes import Hashes, MissingHashes from pip._internal.utils.logging import indent_log diff --git a/tests/unit/resolution_resolvelib/conftest.py b/tests/unit/resolution_resolvelib/conftest.py index 178be2e9e15..ca580f246d9 100644 --- a/tests/unit/resolution_resolvelib/conftest.py +++ b/tests/unit/resolution_resolvelib/conftest.py @@ -11,9 +11,9 @@ from pip._internal.models.search_scope import SearchScope from pip._internal.models.selection_prefs import SelectionPreferences from pip._internal.network.session import PipSession +from pip._internal.operations.build.build_tracker import get_build_tracker from pip._internal.operations.prepare import RequirementPreparer from pip._internal.req.constructors import install_req_from_line -from pip._internal.req.req_tracker import get_build_tracker from pip._internal.resolution.resolvelib.factory import Factory from pip._internal.resolution.resolvelib.provider import PipProvider from pip._internal.utils.temp_dir import TempDirectory, global_tempdir_manager diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py index 8ceaa9b206a..f8e8f24de23 100644 --- a/tests/unit/test_req.py +++ b/tests/unit/test_req.py @@ -23,6 +23,7 @@ from pip._internal.index.package_finder import PackageFinder from pip._internal.metadata.pkg_resources import Distribution from pip._internal.network.session import PipSession +from pip._internal.operations.build.build_tracker import get_build_tracker from pip._internal.operations.prepare import RequirementPreparer from pip._internal.req import InstallRequirement, RequirementSet from pip._internal.req.constructors import ( @@ -39,7 +40,6 @@ get_line_parser, handle_requirement_line, ) -from pip._internal.req.req_tracker import get_build_tracker from pip._internal.resolution.legacy.resolver import Resolver from pip._internal.utils.urls import path_to_url from tests.lib import TestData, make_test_finder, requirements_file From de1c798243bf9d761fe6432d1179f6f4325d5b39 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 26 Mar 2022 10:50:49 +0000 Subject: [PATCH 5/5] Rename all {req -> build}_tracker arguments/variables --- src/pip/_internal/cli/req_command.py | 4 ++-- src/pip/_internal/commands/download.py | 4 ++-- src/pip/_internal/commands/install.py | 4 ++-- src/pip/_internal/commands/wheel.py | 4 ++-- src/pip/_internal/operations/prepare.py | 12 ++++++------ tests/unit/resolution_resolvelib/conftest.py | 2 +- tests/unit/test_req.py | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py index b76684135b5..970deec2cb2 100644 --- a/src/pip/_internal/cli/req_command.py +++ b/src/pip/_internal/cli/req_command.py @@ -257,7 +257,7 @@ def make_requirement_preparer( cls, temp_build_dir: TempDirectory, options: Values, - req_tracker: BuildTracker, + build_tracker: BuildTracker, session: PipSession, finder: PackageFinder, use_user_site: bool, @@ -314,7 +314,7 @@ def make_requirement_preparer( src_dir=options.src_dir, download_dir=download_dir, build_isolation=options.build_isolation, - req_tracker=req_tracker, + build_tracker=build_tracker, session=session, progress_bar=options.progress_bar, finder=finder, diff --git a/src/pip/_internal/commands/download.py b/src/pip/_internal/commands/download.py index 5287276d782..a6d7e628f2b 100644 --- a/src/pip/_internal/commands/download.py +++ b/src/pip/_internal/commands/download.py @@ -95,7 +95,7 @@ def run(self, options: Values, args: List[str]) -> int: ignore_requires_python=options.ignore_requires_python, ) - req_tracker = self.enter_context(get_build_tracker()) + build_tracker = self.enter_context(get_build_tracker()) directory = TempDirectory( delete=not options.no_clean, @@ -108,7 +108,7 @@ def run(self, options: Values, args: List[str]) -> int: preparer = self.make_requirement_preparer( temp_build_dir=directory, options=options, - req_tracker=req_tracker, + build_tracker=build_tracker, session=session, finder=finder, download_dir=options.download_dir, diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py index 431068cb090..db41b9a1b03 100644 --- a/src/pip/_internal/commands/install.py +++ b/src/pip/_internal/commands/install.py @@ -293,7 +293,7 @@ def run(self, options: Values, args: List[str]) -> int: ) wheel_cache = WheelCache(options.cache_dir, options.format_control) - req_tracker = self.enter_context(get_build_tracker()) + build_tracker = self.enter_context(get_build_tracker()) directory = TempDirectory( delete=not options.no_clean, @@ -315,7 +315,7 @@ def run(self, options: Values, args: List[str]) -> int: preparer = self.make_requirement_preparer( temp_build_dir=directory, options=options, - req_tracker=req_tracker, + build_tracker=build_tracker, session=session, finder=finder, use_user_site=options.use_user_site, diff --git a/src/pip/_internal/commands/wheel.py b/src/pip/_internal/commands/wheel.py index 47cc8b00690..4fefe8111dd 100644 --- a/src/pip/_internal/commands/wheel.py +++ b/src/pip/_internal/commands/wheel.py @@ -108,7 +108,7 @@ def run(self, options: Values, args: List[str]) -> int: options.wheel_dir = normalize_path(options.wheel_dir) ensure_dir(options.wheel_dir) - req_tracker = self.enter_context(get_build_tracker()) + build_tracker = self.enter_context(get_build_tracker()) directory = TempDirectory( delete=not options.no_clean, @@ -121,7 +121,7 @@ def run(self, options: Values, args: List[str]) -> int: preparer = self.make_requirement_preparer( temp_build_dir=directory, options=options, - req_tracker=req_tracker, + build_tracker=build_tracker, session=session, finder=finder, download_dir=options.wheel_dir, diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py index cfa6b665e1d..46252816dcc 100644 --- a/src/pip/_internal/operations/prepare.py +++ b/src/pip/_internal/operations/prepare.py @@ -48,13 +48,13 @@ def _get_prepared_distribution( req: InstallRequirement, - req_tracker: BuildTracker, + build_tracker: BuildTracker, finder: PackageFinder, build_isolation: bool, ) -> BaseDistribution: """Prepare a distribution for installation.""" abstract_dist = make_distribution_for_install_requirement(req) - with req_tracker.track(req): + with build_tracker.track(req): abstract_dist.prepare_distribution_metadata(finder, build_isolation) return abstract_dist.get_metadata_distribution() @@ -261,7 +261,7 @@ def __init__( download_dir: Optional[str], src_dir: str, build_isolation: bool, - req_tracker: BuildTracker, + build_tracker: BuildTracker, session: PipSession, progress_bar: str, finder: PackageFinder, @@ -275,7 +275,7 @@ def __init__( self.src_dir = src_dir self.build_dir = build_dir - self.req_tracker = req_tracker + self.build_tracker = build_tracker self._session = session self._download = Downloader(session, progress_bar) self._batch_download = BatchDownloader(session, progress_bar) @@ -555,7 +555,7 @@ def _prepare_linked_requirement( dist = _get_prepared_distribution( req, - self.req_tracker, + self.build_tracker, self.finder, self.build_isolation, ) @@ -608,7 +608,7 @@ def prepare_editable_requirement( dist = _get_prepared_distribution( req, - self.req_tracker, + self.build_tracker, self.finder, self.build_isolation, ) diff --git a/tests/unit/resolution_resolvelib/conftest.py b/tests/unit/resolution_resolvelib/conftest.py index ca580f246d9..6cef3c17cff 100644 --- a/tests/unit/resolution_resolvelib/conftest.py +++ b/tests/unit/resolution_resolvelib/conftest.py @@ -42,7 +42,7 @@ def preparer(finder: PackageFinder) -> Iterator[RequirementPreparer]: preparer = RequirementCommand.make_requirement_preparer( tmp, options=o[0], - req_tracker=tracker, + build_tracker=tracker, session=session, finder=finder, use_user_site=False, diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py index f8e8f24de23..4a339e4e231 100644 --- a/tests/unit/test_req.py +++ b/tests/unit/test_req.py @@ -91,7 +91,7 @@ def _basic_resolver( src_dir=os.path.join(self.tempdir, "src"), download_dir=None, build_isolation=True, - req_tracker=tracker, + build_tracker=tracker, session=session, progress_bar="on", finder=finder,