refactor: reorganize type definitions and simplify imports

Move type definitions closer to their usage and remove unnecessary import
aliases across both projects for better module cohesion.

Type movements:
- GivenPyProjectResult: vcs-versioning/_types.py → _pyproject_reading.py
  (moved to where it's actually used in read_pyproject)

- VersionInferenceApplicable, GetVersionInferenceConfig:
  vcs-versioning/_types.py → setuptools-scm/_integration/version_inference.py
  (setuptools-scm specific protocols moved to their implementation module)

Import simplifications:
- setuptools-scm/_integration/pyproject_reading.py:
  - Import GivenPyProjectResult directly (not via _types)
  - Import get_args_for_pyproject directly (not as alias)
  - Remove wrapper function, just re-export from vcs-versioning

- setuptools-scm/_integration/setuptools.py:
  - Import GivenPyProjectResult from _pyproject_reading
  - Import GetVersionInferenceConfig from version_inference
  - Remove _types module import (no longer needed)

- vcs-versioning/_config.py:
  - Import get_args_for_pyproject, read_pyproject directly
  - Remove unnecessary _ prefixes from imports

- vcs-versioning/_pyproject_reading.py:
  - Add GivenPyProjectResult TypeAlias definition
  - Remove _types module import, use direct import

- vcs-versioning/_types.py:
  - Remove GivenPyProjectResult (moved to _pyproject_reading)
  - Remove version inference protocols (moved to setuptools-scm)
  - Remove Protocol from imports (no longer needed)
  - Remove unused TYPE_CHECKING imports

Benefits:
- Better module cohesion - types live with their usage
- Cleaner imports without unnecessary aliases
- vcs-versioning/_types.py now only contains core VCS types
- Version inference types properly scoped to setuptools-scm
- No functional changes

All tests pass (65 tests: pyproject reading, integration, config, version inference).

Author: RonnyPfannschmidt

setuptools-scm/src/setuptools_scm/_integration/pyproject_reading.py

@@ -5,12 +5,10 @@
 from collections.abc import Sequence
 from pathlib import Path
 
-from vcs_versioning import _types as _t
 from vcs_versioning._pyproject_reading import DEFAULT_PYPROJECT_PATH
+from vcs_versioning._pyproject_reading import GivenPyProjectResult
 from vcs_versioning._pyproject_reading import PyProjectData
-from vcs_versioning._pyproject_reading import (
-    get_args_for_pyproject as _vcs_get_args_for_pyproject,
-)
+from vcs_versioning._pyproject_reading import get_args_for_pyproject
 from vcs_versioning._pyproject_reading import read_pyproject as _vcs_read_pyproject
 from vcs_versioning._requirement_cls import Requirement
 from vcs_versioning._requirement_cls import extract_package_name
@@ -121,7 +119,7 @@ def read_pyproject(
     path: Path = DEFAULT_PYPROJECT_PATH,
     tool_name: str = "setuptools_scm",
     canonical_build_package_name: str = "setuptools-scm",
-    _given_result: _t.GivenPyProjectResult = None,
+    _given_result: GivenPyProjectResult = None,
     _given_definition: TOML_RESULT | None = None,
 ) -> PyProjectData:
     """Read and parse pyproject configuration with setuptools-specific extensions.
@@ -147,12 +145,3 @@ def read_pyproject(
     _check_setuptools_dynamic_version_conflict(path, pyproject_data)
 
     return pyproject_data
-
-
-def get_args_for_pyproject(
-    pyproject: PyProjectData,
-    dist_name: str | None,
-    kwargs: TOML_RESULT,
-) -> TOML_RESULT:
-    """Delegate to vcs_versioning's implementation"""
-    return _vcs_get_args_for_pyproject(pyproject, dist_name, kwargs)

setuptools-scm/src/setuptools_scm/_integration/setuptools.py

@@ -8,7 +8,7 @@
 
 import setuptools
 
-from vcs_versioning import _types as _t
+from vcs_versioning._pyproject_reading import GivenPyProjectResult
 from vcs_versioning._toml import InvalidTomlError
 from vcs_versioning.overrides import GlobalOverrides
 from vcs_versioning.overrides import ensure_context
@@ -17,6 +17,7 @@
 from .pyproject_reading import read_pyproject
 from .setup_cfg import SetuptoolsBasicData
 from .setup_cfg import extract_from_legacy
+from .version_inference import GetVersionInferenceConfig
 from .version_inference import get_version_inference_config
 
 log = logging.getLogger(__name__)
@@ -74,9 +75,9 @@ def version_keyword(
     keyword: str,
     value: bool | dict[str, Any] | Callable[[], dict[str, Any]],
     *,
-    _given_pyproject_data: _t.GivenPyProjectResult = None,
+    _given_pyproject_data: GivenPyProjectResult = None,
     _given_legacy_data: SetuptoolsBasicData | None = None,
-    _get_version_inference_config: _t.GetVersionInferenceConfig = get_version_inference_config,
+    _get_version_inference_config: GetVersionInferenceConfig = get_version_inference_config,
 ) -> None:
     """apply version infernce when setup(use_scm_version=...) is used
     this takes priority over the finalize_options based version
@@ -131,9 +132,9 @@ def version_keyword(
 def infer_version(
     dist: setuptools.Distribution,
     *,
-    _given_pyproject_data: _t.GivenPyProjectResult = None,
+    _given_pyproject_data: GivenPyProjectResult = None,
     _given_legacy_data: SetuptoolsBasicData | None = None,
-    _get_version_inference_config: _t.GetVersionInferenceConfig = get_version_inference_config,
+    _get_version_inference_config: GetVersionInferenceConfig = get_version_inference_config,
 ) -> None:
     """apply version inference from the finalize_options hook
     this is the default for pyproject.toml based projects that don't use the use_scm_version keyword
@@ -162,8 +163,8 @@ def _infer_version_impl(
     *,
     dist_name: str | None,
     legacy_data: SetuptoolsBasicData,
-    _given_pyproject_data: _t.GivenPyProjectResult = None,
-    _get_version_inference_config: _t.GetVersionInferenceConfig = get_version_inference_config,
+    _given_pyproject_data: GivenPyProjectResult = None,
+    _get_version_inference_config: GetVersionInferenceConfig = get_version_inference_config,
 ) -> None:
     """Internal implementation of infer_version."""
     try:

setuptools-scm/src/setuptools_scm/_integration/version_inference.py

@@ -3,17 +3,42 @@
 import logging
 
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
 from typing import Any
+from typing import Protocol
 from typing import TypeAlias
 
 from setuptools import Distribution
 from vcs_versioning._pyproject_reading import PyProjectData
 
 from .pyproject_reading import should_infer
 
+if TYPE_CHECKING:
+    pass  # Concrete implementations defined below
+
 log = logging.getLogger(__name__)
 
 
+class VersionInferenceApplicable(Protocol):
+    """A result object from version inference decision that can be applied to a dist."""
+
+    def apply(self, dist: Distribution) -> None:  # pragma: no cover - structural type
+        ...
+
+
+class GetVersionInferenceConfig(Protocol):
+    """Callable protocol for the decision function used by integration points."""
+
+    def __call__(
+        self,
+        dist_name: str | None,
+        current_version: str | None,
+        pyproject_data: PyProjectData,
+        overrides: dict[str, object] | None = None,
+    ) -> VersionInferenceApplicable:  # pragma: no cover - structural type
+        ...
+
+
 @dataclass
 class VersionInferenceConfig:
     """Configuration for version inference."""

vcs-versioning/src/vcs_versioning/_config.py

@@ -16,9 +16,7 @@
 
 from . import _types as _t
 from ._overrides import read_toml_overrides
-from ._pyproject_reading import PyProjectData
-from ._pyproject_reading import get_args_for_pyproject as _get_args_for_pyproject
-from ._pyproject_reading import read_pyproject as _read_pyproject
+from ._pyproject_reading import PyProjectData, get_args_for_pyproject, read_pyproject
 from ._version_cls import Version as _Version
 from ._version_cls import _validate_version_cls
 from ._version_cls import _Version as _VersionAlias
@@ -282,8 +280,8 @@ def from_file(
         """
 
         if pyproject_data is None:
-            pyproject_data = _read_pyproject(Path(name))
-        args = _get_args_for_pyproject(pyproject_data, dist_name, kwargs)
+            pyproject_data = read_pyproject(Path(name))
+        args = get_args_for_pyproject(pyproject_data, dist_name, kwargs)
 
         args.update(read_toml_overrides(args["dist_name"]))
         relative_to = args.pop("relative_to", name)

vcs-versioning/src/vcs_versioning/_pyproject_reading.py

@@ -9,23 +9,31 @@
 from collections.abc import Sequence
 from dataclasses import dataclass
 from pathlib import Path
+from typing import TYPE_CHECKING, TypeAlias, Union
 
 if sys.version_info >= (3, 11):
     from typing import Self
 else:
     from typing_extensions import Self
 
-from . import _types as _t
 from ._requirement_cls import extract_package_name
 from ._toml import TOML_RESULT, InvalidTomlError, read_toml_content
 
+if TYPE_CHECKING:
+    pass  # PyProjectData is defined below
+
 log = logging.getLogger(__name__)
 
 _ROOT = "root"
 
 
 DEFAULT_PYPROJECT_PATH = Path("pyproject.toml")
 
+# Testing injection type for configuration reading
+GivenPyProjectResult: TypeAlias = Union[
+    "PyProjectData", InvalidTomlError, FileNotFoundError, None
+]
+
 
 @dataclass
 class PyProjectData:
@@ -170,7 +178,7 @@ def has_build_package(
 def read_pyproject(
     path: Path = DEFAULT_PYPROJECT_PATH,
     canonical_build_package_name: str = "setuptools-scm",
-    _given_result: _t.GivenPyProjectResult = None,
+    _given_result: GivenPyProjectResult = None,
     _given_definition: TOML_RESULT | None = None,
     tool_names: list[str] | None = None,
 ) -> PyProjectData:

vcs-versioning/src/vcs_versioning/_types.py

@@ -2,14 +2,10 @@
 
 import os
 from collections.abc import Callable, Sequence
-from typing import TYPE_CHECKING, Protocol, TypeAlias, Union
+from typing import TYPE_CHECKING, TypeAlias, Union
 
 if TYPE_CHECKING:
-    from setuptools import Distribution
-
     from . import _version_schemes as version
-    from ._pyproject_reading import PyProjectData
-    from ._toml import InvalidTomlError
 
 PathT: TypeAlias = Union["os.PathLike[str]", str]
 
@@ -21,28 +17,3 @@
 
 # Git pre-parse function types
 GIT_PRE_PARSE: TypeAlias = str | None
-
-# Testing injection types for configuration reading
-GivenPyProjectResult: TypeAlias = Union[
-    "PyProjectData", "InvalidTomlError", FileNotFoundError, None
-]
-
-
-class VersionInferenceApplicable(Protocol):
-    """A result object from version inference decision that can be applied to a dist."""
-
-    def apply(self, dist: Distribution) -> None:  # pragma: no cover - structural type
-        ...
-
-
-class GetVersionInferenceConfig(Protocol):
-    """Callable protocol for the decision function used by integration points."""
-
-    def __call__(
-        self,
-        dist_name: str | None,
-        current_version: str | None,
-        pyproject_data: PyProjectData,
-        overrides: dict[str, object] | None = None,
-    ) -> VersionInferenceApplicable:  # pragma: no cover - structural type
-        ...