diff options
author | Pradyun Gedam <pradyunsg@users.noreply.github.com> | 2022-03-26 10:50:49 +0000 |
---|---|---|
committer | Pradyun Gedam <pradyunsg@users.noreply.github.com> | 2022-03-26 12:09:32 +0000 |
commit | de1c798243bf9d761fe6432d1179f6f4325d5b39 (patch) | |
tree | 4a0a94d720c10ff0ecfad1f9d71e48d2cf40db44 | |
parent | e5542dc024e916569226e1cd29e49d9384eed466 (diff) | |
download | pip-de1c798243bf9d761fe6432d1179f6f4325d5b39.tar.gz |
Rename all {req -> build}_tracker arguments/variables
-rw-r--r-- | src/pip/_internal/cli/req_command.py | 4 | ||||
-rw-r--r-- | src/pip/_internal/commands/download.py | 4 | ||||
-rw-r--r-- | src/pip/_internal/commands/install.py | 4 | ||||
-rw-r--r-- | src/pip/_internal/commands/wheel.py | 4 | ||||
-rw-r--r-- | src/pip/_internal/operations/prepare.py | 12 | ||||
-rw-r--r-- | tests/unit/resolution_resolvelib/conftest.py | 2 | ||||
-rw-r--r-- | 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 b76684135..970deec2c 100644 --- a/src/pip/_internal/cli/req_command.py +++ b/src/pip/_internal/cli/req_command.py @@ -257,7 +257,7 @@ class RequirementCommand(IndexGroupCommand): 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 @@ class RequirementCommand(IndexGroupCommand): 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 5287276d7..a6d7e628f 100644 --- a/src/pip/_internal/commands/download.py +++ b/src/pip/_internal/commands/download.py @@ -95,7 +95,7 @@ class DownloadCommand(RequirementCommand): 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 @@ class DownloadCommand(RequirementCommand): 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 431068cb0..db41b9a1b 100644 --- a/src/pip/_internal/commands/install.py +++ b/src/pip/_internal/commands/install.py @@ -293,7 +293,7 @@ class InstallCommand(RequirementCommand): ) 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 @@ class InstallCommand(RequirementCommand): 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 47cc8b006..4fefe8111 100644 --- a/src/pip/_internal/commands/wheel.py +++ b/src/pip/_internal/commands/wheel.py @@ -108,7 +108,7 @@ class WheelCommand(RequirementCommand): 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 @@ class WheelCommand(RequirementCommand): 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 cfa6b665e..46252816d 100644 --- a/src/pip/_internal/operations/prepare.py +++ b/src/pip/_internal/operations/prepare.py @@ -48,13 +48,13 @@ logger = logging.getLogger(__name__) 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 @@ class RequirementPreparer: 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 @@ class RequirementPreparer: 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 @@ class RequirementPreparer: dist = _get_prepared_distribution( req, - self.req_tracker, + self.build_tracker, self.finder, self.build_isolation, ) @@ -608,7 +608,7 @@ class RequirementPreparer: 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 ca580f246..6cef3c17c 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 f8e8f24de..4a339e4e2 100644 --- a/tests/unit/test_req.py +++ b/tests/unit/test_req.py @@ -91,7 +91,7 @@ class TestRequirementSet: 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, |