Skip to content

Commit 057c509

Browse files
refactor: remove unused private shim modules
Delete unused private re-export modules: - _config.py (not used internally) - _version_cls.py (not used internally) - _cli.py (not used internally) Update imports and entrypoints to use vcs_versioning directly: - Update console_scripts entrypoint to vcs_versioning._cli:main - Update test imports to use vcs_versioning modules - __init__.py already imports directly from vcs_versioning Keep modules that are still needed: - _get_version_impl.py (has setuptools-specific get_version wrapper) - _log.py (used internally by _integration and _file_finders) - Public modules (version.py, integration.py, etc.) for backward compat
1 parent 7e6003f commit 057c509

File tree

7 files changed

+15
-52
lines changed

7 files changed

+15
-52
lines changed

nextgen/vcs-versioning/testingB/test_git.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -716,8 +716,8 @@ def test_git_pre_parse_config_integration(wd: WorkDir) -> None:
716716
assert result is not None
717717

718718
# Test with explicit configuration
719-
from setuptools_scm._config import GitConfiguration
720-
from setuptools_scm._config import ScmConfiguration
719+
from vcs_versioning._config import GitConfiguration
720+
from vcs_versioning._config import ScmConfiguration
721721

722722
config_with_pre_parse = Configuration(
723723
scm=ScmConfiguration(
@@ -823,8 +823,8 @@ def test_git_describe_command_init_argument_deprecation() -> None:
823823

824824
def test_git_describe_command_init_conflict() -> None:
825825
"""Test that specifying both old and new configuration raises ValueError."""
826-
from setuptools_scm._config import GitConfiguration
827-
from setuptools_scm._config import ScmConfiguration
826+
from vcs_versioning._config import GitConfiguration
827+
from vcs_versioning._config import ScmConfiguration
828828

829829
# Both old init arg and new configuration specified - should raise ValueError
830830
with pytest.warns(DeprecationWarning, match=r"git_describe_command.*deprecated"):

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ documentation = "https://setuptools-scm.readthedocs.io/"
8585
repository = "https://github.com/pypa/setuptools-scm/"
8686

8787
[project.entry-points.console_scripts]
88-
setuptools-scm = "setuptools_scm._cli:main"
88+
setuptools-scm = "vcs_versioning._cli:main"
8989

9090
[project.entry-points."distutils.setup_keywords"]
9191
use_scm_version = "setuptools_scm._integration.setuptools:version_keyword"
9292

9393
[project.entry-points."pipx.run"]
94-
setuptools-scm = "setuptools_scm._cli:main"
95-
setuptools_scm = "setuptools_scm._cli:main"
94+
setuptools-scm = "vcs_versioning._cli:main"
95+
setuptools_scm = "vcs_versioning._cli:main"
9696

9797
[project.entry-points."setuptools.file_finders"]
9898
setuptools_scm = "setuptools_scm._file_finders:find_files"

src/setuptools_scm/__init__.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55

66
from __future__ import annotations
77

8+
from vcs_versioning import Configuration
9+
from vcs_versioning import NonNormalizedVersion
10+
from vcs_versioning import ScmVersion
11+
from vcs_versioning import Version
12+
from vcs_versioning._config import DEFAULT_LOCAL_SCHEME
13+
from vcs_versioning._config import DEFAULT_VERSION_SCHEME
814
from vcs_versioning._dump_version import dump_version # soft deprecated
15+
from vcs_versioning._get_version_impl import _get_version
916

10-
from ._config import DEFAULT_LOCAL_SCHEME
11-
from ._config import DEFAULT_VERSION_SCHEME
12-
from ._config import Configuration
13-
from ._get_version_impl import _get_version
1417
from ._get_version_impl import get_version
15-
from ._version_cls import NonNormalizedVersion
16-
from ._version_cls import Version
17-
from .version import ScmVersion
1818

1919
# Public API
2020
__all__ = [

src/setuptools_scm/_cli.py

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

src/setuptools_scm/_config.py

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

src/setuptools_scm/_version_cls.py

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

testing/test_cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
import pytest
88

9+
from vcs_versioning._cli import main
910
from vcs_versioning.test_api import WorkDir
1011

11-
from setuptools_scm._cli import main
1212
from setuptools_scm._integration.pyproject_reading import PyProjectData
1313

1414
from .conftest import DebugMode

0 commit comments

Comments
 (0)