fix(tests): fix failing e2e regression tests for release

Author: markurtz

.detect-secrets.scan.json

@@ -139,5 +139,5 @@
       }
     ]
   },
-  "generated_at": "2026-06-11T21:44:25Z"
+  "generated_at": "2026-06-12T09:44:07Z"
 }

src/gitversioned/compat.py

@@ -14,7 +14,7 @@
 import types
 from typing import Annotated
 
-__all__ = ["maturin", "opentelemetry_trace", "psutil", "tomllib"]
+__all__ = ["DistutilsSetupError", "maturin", "opentelemetry_trace", "psutil", "tomllib"]
 
 _maturin: types.ModuleType | None = None
 try:
@@ -45,6 +45,19 @@
 except ImportError:
     _psutil = None
 
+_DistutilsSetupError: type[Exception]
+try:
+    import setuptools.errors
+
+    _DistutilsSetupError = setuptools.errors.SetupError
+except ImportError:
+    try:
+        import distutils.errors
+
+        _DistutilsSetupError = distutils.errors.DistutilsSetupError
+    except ImportError:
+        _DistutilsSetupError = Exception
+
 maturin: Annotated[
     types.ModuleType | None,
     "Enables the maturin build backend wrapper. Provides the ``maturin`` "
@@ -70,3 +83,8 @@
     "``pyproject.toml``. Provides the standard library ``tomllib``, the "
     "third-party ``tomli``, or ``None``.",
 ] = _tomllib
+
+DistutilsSetupError: Annotated[
+    type[Exception],
+    "The SetupError exception class resolved from setuptools or distutils.",
+] = _DistutilsSetupError

src/gitversioned/plugins/setuptools_plugin.py

@@ -18,13 +18,13 @@
 
 import email
 import os
-from distutils.errors import DistutilsSetupError
 from pathlib import Path
 from typing import Any, cast
 
 from packaging.utils import canonicalize_name
 from setuptools import Distribution
 
+from gitversioned.compat import DistutilsSetupError
 from gitversioned.logging import autolog, configure_logger, logger
 from gitversioned.settings import Settings
 from gitversioned.utils import BuildEnvironment, GitRepository

tests/python/unit/test_compat.py

@@ -43,7 +43,14 @@ def restore_compat_module() -> Any:
 @pytest.mark.smoke
 def test_smoke_module_exports() -> None:
     """Verify that compat exposes the expected variables and matches expected types."""
-    assert compat.__all__ == ["maturin", "opentelemetry_trace", "psutil", "tomllib"]
+    assert compat.__all__ == [
+        "DistutilsSetupError",
+        "maturin",
+        "opentelemetry_trace",
+        "psutil",
+        "tomllib",
+    ]
+    assert hasattr(compat, "DistutilsSetupError")
     assert hasattr(compat, "maturin")
     assert hasattr(compat, "opentelemetry_trace")
     assert hasattr(compat, "psutil")