Merge pull request #724 from RonnyPfannschmidt/fix-722-self-bootstrap

minimize bootstrap - fixes #722 and #722

Author: RonnyPfannschmidt

CHANGELOG.rst

@@ -1,3 +1,11 @@
+v7.0.2
+======
+
+* fix #723 and #722: remove bootstrap dependencies
+* bugfix: ensure we read the distribution name from setup.cfg
+  if needed even for pyproject
+*
+
 v7.0.1
 =======
 

pyproject.toml

@@ -1,9 +1,6 @@
 [build-system]
 requires = [
     "setuptools>=45",
-    "tomli>=1.0",
     "packaging>=20.0",
-    "typing_extensions",
-    "importlib_metadata",
 ]
 build-backend = "setuptools.build_meta"

src/setuptools_scm/__init__.py

@@ -10,7 +10,6 @@
 from typing import Callable
 from typing import TYPE_CHECKING
 
-from . import _types as _t
 from ._entrypoints import _call_entrypoint_fn
 from ._entrypoints import _version_from_entrypoints
 from ._overrides import _read_pretended_version_for
@@ -33,6 +32,7 @@
 if TYPE_CHECKING:
     from typing import NoReturn
 
+    from . import _types as _t
 
 TEMPLATES = {
     ".py": """\

src/setuptools_scm/_entrypoints.py

@@ -6,18 +6,20 @@
 from typing import overload
 from typing import TYPE_CHECKING
 
-from typing_extensions import Protocol
-
-from . import _types as _t
 from .utils import function_has_arg
 from .utils import trace
 from .version import ScmVersion
 
 if TYPE_CHECKING:
     from .config import Configuration
+    from typing_extensions import Protocol
+    from . import _types as _t
 else:
     Configuration = Any
 
+    class Protocol:
+        pass
+
 
 class MaybeConfigFunction(Protocol):
     __name__: str
@@ -71,7 +73,17 @@ def _version_from_entrypoints(
 try:
     from importlib.metadata import entry_points  # type: ignore
 except ImportError:
-    from importlib_metadata import entry_points
+    try:
+        from importlib_metadata import entry_points
+    except ImportError:
+        from collections import defaultdict
+
+        def entry_points() -> dict[str, list[_t.EntrypointProtocol]]:
+            warnings.warn(
+                "importlib metadata missing, "
+                "this may happen at build time for python3.7"
+            )
+            return defaultdict(list)
 
 
 def iter_entry_points(

src/setuptools_scm/_types.py

@@ -3,7 +3,6 @@
 from typing import Any
 from typing import Callable
 from typing import List
-from typing import NamedTuple
 from typing import TYPE_CHECKING
 from typing import TypeVar
 from typing import Union
@@ -22,12 +21,6 @@
 VERSION_SCHEME = Union[str, Callable[["version.ScmVersion"], str]]
 
 
-class CmdResult(NamedTuple):
-    out: str
-    err: str
-    returncode: int
-
-
 class EntrypointProtocol(Protocol):
     name: str
 

src/setuptools_scm/config.py

@@ -12,13 +12,13 @@
 from typing import TYPE_CHECKING
 from typing import Union
 
-from . import _types as _t
 from ._version_cls import NonNormalizedVersion
 from ._version_cls import Version
 from .utils import trace
 
 
 if TYPE_CHECKING:
+    from . import _types as _t
     from setuptools_scm.version import ScmVersion
 
 DEFAULT_TAG_REGEX = r"^(?:[\w-]+-)?(?P<version>[vV]?\d+(?:\.\d+){0,2}[^\+]*)(?:\+.*)?$"

src/setuptools_scm/discover.py

@@ -3,8 +3,10 @@
 import os
 from typing import Iterable
 from typing import Iterator
+from typing import TYPE_CHECKING
 
-from . import _types as _t
+if TYPE_CHECKING:
+    from . import _types as _t
 from .config import Configuration
 from .utils import trace
 

src/setuptools_scm/file_finder.py

@@ -5,8 +5,8 @@
 
 if TYPE_CHECKING:
     from typing_extensions import TypeGuard
+    from . import _types as _t
 
-from . import _types as _t
 from .utils import trace
 
 

src/setuptools_scm/file_finder_git.py

@@ -5,13 +5,17 @@
 import subprocess
 import tarfile
 from typing import IO
+from typing import TYPE_CHECKING
 
-from . import _types as _t
 from .file_finder import is_toplevel_acceptable
 from .file_finder import scm_find_files
 from .utils import do_ex
 from .utils import trace
 
+if TYPE_CHECKING:
+    from . import _types as _t
+
+
 log = logging.getLogger(__name__)
 
 

src/setuptools_scm/git.py

@@ -11,9 +11,9 @@
 from typing import Callable
 from typing import TYPE_CHECKING
 
-from . import _types as _t
 from .config import Configuration
 from .scm_workdir import Workdir
+from .utils import _CmdResult
 from .utils import data_from_mime
 from .utils import do_ex
 from .utils import require_command
@@ -23,6 +23,8 @@
 from .version import tags_to_versions
 
 if TYPE_CHECKING:
+    from . import _types as _t
+
     from setuptools_scm.hg_git import GitWorkdirHgClient
 
 REF_TAG_RE = re.compile(r"(?<=\btag: )([^,]+)\b")
@@ -72,7 +74,7 @@ def from_potential_worktree(cls, wd: _t.PathT) -> GitWorkdir | None:
 
         return cls(real_wd)
 
-    def do_ex_git(self, cmd: list[str]) -> _t.CmdResult:
+    def do_ex_git(self, cmd: list[str]) -> _CmdResult:
         return self.do_ex(["git", "--git-dir", join(self.path, ".git")] + cmd)
 
     def is_dirty(self) -> bool:
@@ -120,7 +122,7 @@ def count_all_nodes(self) -> int:
         revs, _, _ = self.do_ex_git(["rev-list", "HEAD"])
         return revs.count("\n") + 1
 
-    def default_describe(self) -> _t.CmdResult:
+    def default_describe(self) -> _CmdResult:
         git_dir = join(self.path, ".git")
         return self.do_ex(
             DEFAULT_DESCRIBE[:1] + ["--git-dir", git_dir] + DEFAULT_DESCRIBE[1:]