migrate to selectable entrypoints

RonnyPfannschmidt · RonnyPfannschmidt · commit e79a57a8d230 · 2025-04-22T10:44:48.000+02:00
diff --git a/src/setuptools_scm/_entrypoints.py b/src/setuptools_scm/_entrypoints.py
@@ -19,12 +19,10 @@
 
 if sys.version_info[:2] < (3, 10):
     from importlib_metadata import EntryPoint as EntryPoint
-    from importlib_metadata import EntryPoints
-    from importlib_metadata import entry_points
+    from importlib_metadata import entry_points as entry_points
 else:
     from importlib.metadata import EntryPoint as EntryPoint
-    from importlib.metadata import EntryPoints
-    from importlib.metadata import entry_points
+    from importlib.metadata import entry_points as entry_points
 
 
 log = _log.log.getChild("entrypoints")
@@ -45,15 +43,8 @@ def version_from_entrypoint(
     return None
 
 
-def iter_entry_points(group: str, name: str | None = None) -> Iterator[EntryPoint]:
-    eps: EntryPoints = entry_points(group=group)
-    res = eps if name is None else eps.select(name=name)
-
-    return iter(res)
-
-
 def _get_ep(group: str, name: str) -> Any | None:
-    for ep in iter_entry_points(group, name):
+    for ep in entry_points(group=group, name=name):
         log.debug("ep found: %s", ep.name)
         return ep.load()
     return None
diff --git a/src/setuptools_scm/_file_finders/__init__.py b/src/setuptools_scm/_file_finders/__init__.py
@@ -1,14 +1,14 @@
 from __future__ import annotations
 
-import itertools
 import os
 
 from typing import TYPE_CHECKING
 from typing import Callable
 
 from .. import _log
 from .. import _types as _t
-from .._entrypoints import iter_entry_points
+from .._entrypoints import EntryPoint
+from .._entrypoints import entry_points
 from .pathtools import norm_real
 
 if TYPE_CHECKING:
@@ -102,10 +102,11 @@ def is_toplevel_acceptable(toplevel: str | None) -> TypeGuard[str]:
 
 
 def find_files(path: _t.PathT = "") -> list[str]:
-    for ep in itertools.chain(
-        iter_entry_points("setuptools_scm.files_command"),
-        iter_entry_points("setuptools_scm.files_command_fallback"),
-    ):
+    eps: list[EntryPoint] = [
+        *entry_points(group="setuptools_scm.files_command"),
+        *entry_points(group="setuptools_scm.files_command_fallback"),
+    ]
+    for ep in eps:
         command: Callable[[_t.PathT], list[str]] = ep.load()
         res: list[str] = command(path)
         if res:
diff --git a/src/setuptools_scm/discover.py b/src/setuptools_scm/discover.py
@@ -58,10 +58,9 @@ def iter_matching_entrypoints(
     """
 
     log.debug("looking for ep %s in %s", entrypoint, root)
-    from ._entrypoints import iter_entry_points
 
     for wd in walk_potential_roots(root, config.search_parent_directories):
-        for ep in iter_entry_points(entrypoint):
+        for ep in _entrypoints.entry_points(group=entrypoint):
             if ep.value in _BLOCKED_EP_TARGETS:
                 continue
             if match_entrypoint(wd, ep.name):
diff --git a/src/setuptools_scm/version.py b/src/setuptools_scm/version.py
@@ -82,11 +82,10 @@ def callable_or_entrypoint(group: str, callable_or_name: str | Any) -> Any:
 
     if callable(callable_or_name):
         return callable_or_name
-    from ._entrypoints import iter_entry_points
 
-    for ep in iter_entry_points(group, callable_or_name):
-        log.debug("ep found: %s", ep.name)
-        return ep.load()
+    from ._entrypoints import _get_ep
+
+    return _get_ep(group, callable_or_name)
 
 
 def tag_to_version(
