Skip to content

Commit a265596

Browse files
refactor: remove AlwaysStdErrHandler and setuptools_scm._log module
Remove obsolete logging code now that logging.lastResort handles the default stderr handler case. Changes: - Remove AlwaysStdErrHandler class from vcs_versioning._log * Use logging.lastResort directly in make_default_handler() * Remove unused sys and IO imports - Delete src/setuptools_scm/_log.py module * Was only re-exporting from vcs_versioning._log * Called configure_logging() on import (no longer needed) - Update imports to use vcs_versioning._log directly: * src/setuptools_scm/_integration/setuptools.py: import configure_logging * src/setuptools_scm/_file_finders/__init__.py: use logging.getLogger() directly All tests pass. The vcs_versioning._log module already configures both 'vcs_versioning' and 'setuptools_scm' loggers, so the setuptools_scm wrapper module is redundant.
1 parent 9510d48 commit a265596

File tree

4 files changed

+5
-42
lines changed

4 files changed

+5
-42
lines changed

nextgen/vcs-versioning/src/vcs_versioning/_log.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
import contextlib
88
import logging
99
import os
10-
import sys
1110

1211
from collections.abc import Iterator
1312
from collections.abc import Mapping
14-
from typing import IO
1513

1614
# Logger names that need configuration
1715
LOGGER_NAMES = [
@@ -20,19 +18,6 @@
2018
]
2119

2220

23-
class AlwaysStdErrHandler(logging.StreamHandler): # type: ignore[type-arg]
24-
def __init__(self) -> None:
25-
super().__init__(sys.stderr)
26-
27-
@property
28-
def stream(self) -> IO[str]:
29-
return sys.stderr
30-
31-
@stream.setter
32-
def stream(self, value: IO[str]) -> None:
33-
assert value is sys.stderr
34-
35-
3621
def make_default_handler() -> logging.Handler:
3722
try:
3823
from rich.console import Console

src/setuptools_scm/_file_finders/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from __future__ import annotations
22

3+
import logging
34
import os
45

56
from collections.abc import Callable
@@ -8,10 +9,9 @@
89
from vcs_versioning import _types as _t
910
from vcs_versioning._entrypoints import entry_points
1011

11-
from .. import _log
1212
from .pathtools import norm_real
1313

14-
log = _log.log.getChild("file_finder")
14+
log = logging.getLogger("setuptools_scm.file_finder")
1515

1616

1717
def scm_find_files(

src/setuptools_scm/_integration/setuptools.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import setuptools
1010

1111
from vcs_versioning import _types as _t
12+
from vcs_versioning._log import configure_logging
1213
from vcs_versioning._toml import InvalidTomlError
1314

14-
from .. import _log
1515
from .pyproject_reading import PyProjectData
1616
from .pyproject_reading import read_pyproject
1717
from .setup_cfg import SetuptoolsBasicData
@@ -79,7 +79,7 @@ def version_keyword(
7979
this takes priority over the finalize_options based version
8080
"""
8181
# Configure logging at setuptools entry point
82-
_log.configure_logging()
82+
configure_logging()
8383

8484
_log_hookstart("version_keyword", dist)
8585

@@ -140,7 +140,7 @@ def infer_version(
140140
as user might have passed custom code version schemes
141141
"""
142142
# Configure logging at setuptools entry point
143-
_log.configure_logging()
143+
configure_logging()
144144

145145
_log_hookstart("infer_version", dist)
146146

src/setuptools_scm/_log.py

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)