Merge branch 'main' into fix-tox-passenv

piptools/logging.py

@@ -16,9 +16,9 @@ class LogContext:
     stream = sys.stderr
 
     def __init__(self, verbosity: int = 0, indent_width: int = 2):
-        self.verbosity = verbosity
-        self.current_indent = 0
-        self._indent_width = indent_width
+        self.verbosity = self._initial_verbosity = verbosity
+        self.current_indent = self._initial_indent = 0
+        self._indent_width = self._initial_indent_width = indent_width
 
     def log(self, message: str, *args: Any, **kwargs: Any) -> None:
         kwargs.setdefault("err", True)
@@ -58,5 +58,11 @@ def indentation(self) -> Iterator[None]:
         finally:
             self._dedent()
 
+    def reset(self) -> None:
+        """Reset logger to initial state."""
+        self.verbosity = self._initial_verbosity
+        self.current_indent = self._initial_indent
+        self._indent_width = self._initial_indent_width
+
 
 log = LogContext()

tests/conftest.py

@@ -26,6 +26,7 @@
 from piptools._compat.pip_compat import uses_pkg_resources
 from piptools.cache import DependencyCache
 from piptools.exceptions import NoCandidateFound
+from piptools.logging import log
 from piptools.repositories import PyPIRepository
 from piptools.repositories.base import BaseRepository
 from piptools.resolver import BacktrackingResolver, LegacyResolver
@@ -432,3 +433,13 @@ def venv(tmp_path):
         check=True,
     )
     return tmp_path / ("Scripts" if platform.system() == "Windows" else "bin")
+
+
+@pytest.fixture(autouse=True)
+def _reset_log():
+    """
+    Since piptools.logging.log is a global variable we have to restore its initial
+    state. Some tests can change logger verbosity which might cause a conflict
+    with other tests that depend on it.
+    """
+    log.reset()