refactor: migrate integration code to vcs-versioning and remove private shims

Move core functionality to vcs-versioning:
- Move dump_version logic to vcs_versioning/_dump_version.py
- Move infer_version_string to vcs_versioning/_version_inference.py
- Update vcs_versioning to use local _dump_version instead of setuptools_scm

Remove unnecessary private shim modules:
- Delete _types.py, _run_cmd.py, _entrypoints.py (private, not in __all__)
- Delete _integration/toml.py (just a re-export)
- Delete _integration/dump_version.py (now in vcs-versioning)
- Keep public modules (git.py, hg.py, discover.py, fallbacks.py) for backward compat
- Keep _version_cls.py (used by public API)

Update imports throughout codebase:
- Update all internal imports to use vcs_versioning directly
- Update test imports in both testing/ and nextgen/vcs-versioning/testingB/
- Fix _own_version_helper.py to import from vcs_versioning

Fix pytest configuration:
- Move pytest_plugins from conftest.py to pyproject.toml addopts
- Prevents 'non-top-level conftest' errors when running all tests from root
- Both test suites now run successfully together (408 passed, 10 skipped, 1 xfailed)

Author: RonnyPfannschmidt

_own_version_helper.py

@@ -14,9 +14,9 @@
 from collections.abc import Callable
 
 from setuptools import build_meta as build_meta
+from vcs_versioning import _types as _t
 
 from setuptools_scm import Configuration
-from setuptools_scm import _types as _t
 from setuptools_scm import get_version
 from setuptools_scm import git
 from setuptools_scm import hg

nextgen/vcs-versioning/pyproject.toml

@@ -101,7 +101,7 @@ exclude_lines = [
 [tool.pytest.ini_options]
 testpaths = ["testingB"]
 python_files = ["test_*.py"]
-addopts = ["-ra", "--strict-markers"]
+addopts = ["-ra", "--strict-markers", "-p", "vcs_versioning.test_api"]
 markers = [
   "issue: marks tests related to specific issues",
 ]

…uptools_scm/_integration/dump_version.py …ning/src/vcs_versioning/_dump_version.pysrc/setuptools_scm/_integration/dump_version.py renamed to nextgen/vcs-versioning/src/vcs_versioning/_dump_version.py src/setuptools_scm/_integration/dump_version.py renamed to nextgen/vcs-versioning/src/vcs_versioning/_dump_version.py

@@ -1,20 +1,25 @@
+"""Core functionality for writing version information to files."""
+
 from __future__ import annotations
 
 import logging
 import warnings
 
 from pathlib import Path
+from typing import TYPE_CHECKING
+
+from ._version_cls import _version_as_tuple
 
-from .. import _types as _t
-from .._version_cls import _version_as_tuple
-from ..version import ScmVersion
+if TYPE_CHECKING:
+    from . import _types as _t
+    from ._version_schemes import ScmVersion
 
 log = logging.getLogger(__name__)
 
 
-TEMPLATES = {
+DEFAULT_TEMPLATES = {
     ".py": """\
-# file generated by setuptools-scm
+# file generated by vcs-versioning
 # don't change, don't track in version control
 
 __all__ = [
@@ -53,38 +58,32 @@
 }
 
 
-def dump_version(
-    root: _t.PathT,
-    version: str,
-    write_to: _t.PathT,
-    template: str | None = None,
-    scm_version: ScmVersion | None = None,
-) -> None:
-    assert isinstance(version, str)
-    root = Path(root)
-    write_to = Path(write_to)
-    if write_to.is_absolute():
-        # trigger warning on escape
-        write_to.relative_to(root)
-        warnings.warn(
-            f"{write_to=!s} is a absolute path,"
-            " please switch to using a relative version file",
-            DeprecationWarning,
-        )
-        target = write_to
-    else:
-        target = Path(root).joinpath(write_to)
-    write_version_to_path(
-        target, template=template, version=version, scm_version=scm_version
-    )
+class DummyScmVersion:
+    """Placeholder for when no ScmVersion is available."""
+
+    @property
+    def short_node(self) -> str | None:
+        return None
 
 
 def _validate_template(target: Path, template: str | None) -> str:
+    """Validate and return the template to use for writing the version file.
+
+    Args:
+        target: The target file path
+        template: User-provided template or None to use default
+
+    Returns:
+        The template string to use
+
+    Raises:
+        ValueError: If no suitable template is found
+    """
     if template == "":
         warnings.warn(f"{template=} looks like a error, using default instead")
         template = None
     if template is None:
-        template = TEMPLATES.get(target.suffix)
+        template = DEFAULT_TEMPLATES.get(target.suffix)
 
     if template is None:
         raise ValueError(
@@ -95,18 +94,20 @@ def _validate_template(target: Path, template: str | None) -> str:
         return template
 
 
-class DummyScmVersion:
-    @property
-    def short_node(self) -> str | None:
-        return None
-
-
 def write_version_to_path(
     target: Path,
     template: str | None,
     version: str,
     scm_version: ScmVersion | None = None,
 ) -> None:
+    """Write version information to a file using a template.
+
+    Args:
+        target: The target file path to write to
+        template: Template string or None to use default based on file extension
+        version: The version string to write
+        scm_version: Optional ScmVersion object for additional metadata
+    """
     final_template = _validate_template(target, template)
     log.debug("dump %s into %s", version, target)
     version_tuple = _version_as_tuple(version)
@@ -126,3 +127,38 @@ def write_version_to_path(
     )
 
     target.write_text(content, encoding="utf-8")
+
+
+def dump_version(
+    root: _t.PathT,
+    version: str,
+    write_to: _t.PathT,
+    template: str | None = None,
+    scm_version: ScmVersion | None = None,
+) -> None:
+    """Write version information to a file relative to root.
+
+    Args:
+        root: The root directory (project root)
+        version: The version string to write
+        write_to: The target file path (relative to root or absolute)
+        template: Template string or None to use default
+        scm_version: Optional ScmVersion object for additional metadata
+    """
+    assert isinstance(version, str)
+    root = Path(root)
+    write_to = Path(write_to)
+    if write_to.is_absolute():
+        # trigger warning on escape
+        write_to.relative_to(root)
+        warnings.warn(
+            f"{write_to=!s} is a absolute path,"
+            " please switch to using a relative version file",
+            DeprecationWarning,
+        )
+        target = write_to
+    else:
+        target = Path(root).joinpath(write_to)
+    write_version_to_path(
+        target, template=template, version=version, scm_version=scm_version
+    )

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

@@ -74,25 +74,17 @@ def write_version_files(
     config: Configuration, version: str, scm_version: ScmVersion
 ) -> None:
     if config.write_to is not None:
-        try:
-            # dump_version is setuptools-specific, may not be available
-            from setuptools_scm._integration.dump_version import dump_version
-        except ImportError:
-            warnings.warn("write_to requires setuptools_scm package", stacklevel=2)
-        else:
-            dump_version(
-                root=config.root,
-                version=version,
-                scm_version=scm_version,
-                write_to=config.write_to,
-                template=config.write_to_template,
-            )
+        from ._dump_version import dump_version
+
+        dump_version(
+            root=config.root,
+            version=version,
+            scm_version=scm_version,
+            write_to=config.write_to,
+            template=config.write_to_template,
+        )
     if config.version_file:
-        try:
-            from setuptools_scm._integration.dump_version import write_version_to_path
-        except ImportError:
-            warnings.warn("version_file requires setuptools_scm package", stacklevel=2)
-            return
+        from ._dump_version import write_version_to_path
 
         version_file = Path(config.version_file)
         assert not version_file.is_absolute(), f"{version_file=}"

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

@@ -0,0 +1,54 @@
+"""Core version inference functionality for build tool integrations."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+from typing import Any
+
+if TYPE_CHECKING:
+    from ._pyproject_reading import PyProjectData
+
+
+def infer_version_string(
+    dist_name: str | None,
+    pyproject_data: PyProjectData,
+    overrides: dict[str, Any] | None = None,
+    *,
+    force_write_version_files: bool = False,
+) -> str:
+    """
+    Compute the inferred version string from the given inputs.
+
+    This is a pure helper that avoids requiring build-tool specific
+    distribution objects, making it easier to test and reuse across
+    different build systems.
+
+    Parameters:
+        dist_name: Optional distribution name (used for overrides and env scoping)
+        pyproject_data: Parsed PyProjectData (may be constructed via for_testing())
+        overrides: Optional override configuration (same keys as [tool.setuptools_scm])
+        force_write_version_files: When True, apply write_to/version_file effects
+
+    Returns:
+        The computed version string.
+
+    Raises:
+        SystemExit: If version cannot be determined (via _version_missing)
+    """
+    from ._get_version_impl import _get_version
+    from ._get_version_impl import _version_missing
+    from .config import Configuration
+
+    config = Configuration.from_file(
+        dist_name=dist_name, pyproject_data=pyproject_data, **(overrides or {})
+    )
+
+    maybe_version = _get_version(
+        config, force_write_version_files=force_write_version_files
+    )
+    if maybe_version is None:
+        _version_missing(config)
+    return maybe_version
+
+
+__all__ = ["infer_version_string"]

nextgen/vcs-versioning/testingB/conftest.py

@@ -6,4 +6,5 @@
 from __future__ import annotations
 
 # Use our own test_api module as a pytest plugin
-pytest_plugins = ["vcs_versioning.test_api"]
+# Moved to pyproject.toml addopts to avoid non-top-level conftest issues
+# pytest_plugins = ["vcs_versioning.test_api"]

nextgen/vcs-versioning/testingB/test_hg_git.py

@@ -2,12 +2,12 @@
 
 import pytest
 
+from vcs_versioning._run_cmd import CommandNotFoundError
+from vcs_versioning._run_cmd import has_command
+from vcs_versioning._run_cmd import run
 from vcs_versioning.test_api import WorkDir
 
 from setuptools_scm import Configuration
-from setuptools_scm._run_cmd import CommandNotFoundError
-from setuptools_scm._run_cmd import has_command
-from setuptools_scm._run_cmd import run
 from setuptools_scm.hg import parse
 
 

nextgen/vcs-versioning/testingB/test_mercurial.py

@@ -6,12 +6,12 @@
 
 import pytest
 
+from vcs_versioning._run_cmd import CommandNotFoundError
 from vcs_versioning.test_api import WorkDir
 
 import setuptools_scm._file_finders
 
 from setuptools_scm import Configuration
-from setuptools_scm._run_cmd import CommandNotFoundError
 from setuptools_scm.hg import archival_to_version
 from setuptools_scm.hg import parse
 from setuptools_scm.version import format_version

pyproject.toml

@@ -136,6 +136,7 @@ ignore = ["PP305", "GH103", "GH212", "MY100", "PC111", "PC160", "PC170", "PC180"
 [tool.pytest.ini_options]
 minversion = "8"
 testpaths = ["testing"]
+addopts = ["-ra", "--strict-config", "--strict-markers", "-p", "vcs_versioning.test_api"]
 timeout = 300  # 5 minutes timeout per test for CI protection
 filterwarnings = [
   "error",
@@ -145,7 +146,6 @@ filterwarnings = [
 log_level = "debug"
 log_cli_level = "info"
 # disable unraisable until investigated
-addopts = ["-ra", "--strict-config", "--strict-markers"]
 markers = [
   "issue(id): reference to github issue",
   "skip_commit: allows to skip committing in the helpers",

src/setuptools_scm/__init__.py

@@ -5,12 +5,13 @@
 
 from __future__ import annotations
 
+from vcs_versioning._dump_version import dump_version  # soft deprecated
+
 from ._config import DEFAULT_LOCAL_SCHEME
 from ._config import DEFAULT_VERSION_SCHEME
 from ._config import Configuration
 from ._get_version_impl import _get_version
 from ._get_version_impl import get_version
-from ._integration.dump_version import dump_version  # soft deprecated
 from ._version_cls import NonNormalizedVersion
 from ._version_cls import Version
 from .version import ScmVersion