From 93a51f1de38594179d9c43fdf556c1cddaa4ce8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sat, 2 Jan 2021 13:43:56 +0100 Subject: [PATCH 1/2] The freeze operation does not need a wheel_cache --- src/pip/_internal/commands/freeze.py | 5 ----- src/pip/_internal/operations/freeze.py | 3 --- 2 files changed, 8 deletions(-) diff --git a/src/pip/_internal/commands/freeze.py b/src/pip/_internal/commands/freeze.py index d9caa3351..8a0b07a06 100644 --- a/src/pip/_internal/commands/freeze.py +++ b/src/pip/_internal/commands/freeze.py @@ -1,10 +1,8 @@ import sys -from pip._internal.cache import WheelCache from pip._internal.cli import cmdoptions from pip._internal.cli.base_command import Command from pip._internal.cli.status_codes import SUCCESS -from pip._internal.models.format_control import FormatControl from pip._internal.operations.freeze import freeze from pip._internal.utils.compat import stdlib_pkgs from pip._internal.utils.deprecation import deprecated @@ -78,8 +76,6 @@ class FreezeCommand(Command): def run(self, options, args): # type: (Values, List[str]) -> int - format_control = FormatControl(set(), set()) - wheel_cache = WheelCache(options.cache_dir, format_control) skip = set(stdlib_pkgs) if not options.freeze_all: skip.update(DEV_PKGS) @@ -104,7 +100,6 @@ class FreezeCommand(Command): user_only=options.user, paths=options.path, isolated=options.isolated_mode, - wheel_cache=wheel_cache, skip=skip, exclude_editable=options.exclude_editable, ) diff --git a/src/pip/_internal/operations/freeze.py b/src/pip/_internal/operations/freeze.py index 47f5ab507..5d63c12fa 100644 --- a/src/pip/_internal/operations/freeze.py +++ b/src/pip/_internal/operations/freeze.py @@ -33,8 +33,6 @@ if MYPY_CHECK_RUNNING: from pip._vendor.pkg_resources import Distribution, Requirement - from pip._internal.cache import WheelCache - RequirementInfo = Tuple[Optional[Union[str, Requirement]], bool, List[str]] @@ -48,7 +46,6 @@ def freeze( user_only=False, # type: bool paths=None, # type: Optional[List[str]] isolated=False, # type: bool - wheel_cache=None, # type: Optional[WheelCache] exclude_editable=False, # type: bool skip=() # type: Container[str] ): From e76eadc9d6128c10f0105ae624342de428a452f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sat, 2 Jan 2021 13:46:55 +0100 Subject: [PATCH 2/2] Pass freeze() kwargs directly --- src/pip/_internal/commands/freeze.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pip/_internal/commands/freeze.py b/src/pip/_internal/commands/freeze.py index 8a0b07a06..bf20db6c3 100644 --- a/src/pip/_internal/commands/freeze.py +++ b/src/pip/_internal/commands/freeze.py @@ -93,7 +93,7 @@ class FreezeCommand(Command): issue=9069, ) - freeze_kwargs = dict( + for line in freeze( requirement=options.requirements, find_links=options.find_links, local_only=options.local, @@ -102,8 +102,6 @@ class FreezeCommand(Command): isolated=options.isolated_mode, skip=skip, exclude_editable=options.exclude_editable, - ) - - for line in freeze(**freeze_kwargs): + ): sys.stdout.write(line + '\n') return SUCCESS