From ce441d2a027f90d2c5a32bbad2f735aac2f6b6d5 Mon Sep 17 00:00:00 2001 From: Phillip Marshall Date: Fri, 13 May 2022 07:25:13 -0700 Subject: [PATCH] Fix support for pip>=22.1 (#1618) --- piptools/repositories/pypi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/piptools/repositories/pypi.py b/piptools/repositories/pypi.py index 2d7d247c6..62babe8be 100644 --- a/piptools/repositories/pypi.py +++ b/piptools/repositories/pypi.py @@ -20,7 +20,6 @@ from click import progressbar from pip._internal.cache import WheelCache -from pip._internal.cli.progress_bars import BAR_TYPES from pip._internal.commands import create_command from pip._internal.commands.install import InstallCommand from pip._internal.index.package_finder import PackageFinder @@ -473,6 +472,9 @@ def _setup_logging(self) -> None: # refactored-out logging config. log.warning("Couldn't find a 'console' logging handler") + # This import will fail with pip 22.1, but here we're pip<22.0 + from pip._internal.cli.progress_bars import BAR_TYPES + # Sync pip's progress bars stream with LogContext.stream for bar_cls in itertools.chain(*BAR_TYPES.values()): bar_cls.file = log.stream