Merge pull request #7772 from chrahunt/refactor/command-level-scoped-…

…tracker Use Command context helper to cleanup requirement tracker
pypa · Feb 23, 2020 · ea47be5 · ea47be5
2 parents 94c83c0 + eb91e8c
commit ea47be5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/pip/_internal/commands/download.py b/src/pip/_internal/commands/download.py
@@ -98,7 +98,9 @@ def run(self, options, args):
         )
         build_delete = (not (options.no_clean or options.build_dir))
 
-        with get_requirement_tracker() as req_tracker, TempDirectory(
+        req_tracker = self.enter_context(get_requirement_tracker())
+
+        with TempDirectory(
             options.build_dir, delete=build_delete, kind="download"
         ) as directory:
             reqs = self.get_requirements(

diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
@@ -284,7 +284,9 @@ def run(self, options, args):
         build_delete = (not (options.no_clean or options.build_dir))
         wheel_cache = WheelCache(options.cache_dir, options.format_control)
 
-        with get_requirement_tracker() as req_tracker, TempDirectory(
+        req_tracker = self.enter_context(get_requirement_tracker())
+
+        with TempDirectory(
             options.build_dir, delete=build_delete, kind="install"
         ) as directory:
             try:

diff --git a/src/pip/_internal/commands/wheel.py b/src/pip/_internal/commands/wheel.py
@@ -124,7 +124,9 @@ def run(self, options, args):
         options.wheel_dir = normalize_path(options.wheel_dir)
         ensure_dir(options.wheel_dir)
 
-        with get_requirement_tracker() as req_tracker, TempDirectory(
+        req_tracker = self.enter_context(get_requirement_tracker())
+
+        with TempDirectory(
             options.build_dir, delete=build_delete, kind="wheel"
         ) as directory:
             reqs = self.get_requirements(