Rely on coherent.deps for import detection.

coherent-oss · Aug 31, 2024 · 9492957 · 9492957
1 parent 1b6e6bc
commit 9492957
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/__init__.py b/__init__.py
@@ -12,6 +12,7 @@
     'importlib_resources; python_version < "3.12"',
     'jaraco.vcs',
     'more-itertools',
+    'coherent.deps',
 ]
 
 

diff --git a/discovery.py b/discovery.py
@@ -25,8 +25,8 @@
 from packaging.version import Version
 from pip_run import scripts
 
-from . import imports
-from . import pypi
+from ..deps import imports
+from ..deps import pypi
 
 log = logging.getLogger(__name__)
 

diff --git a/metadata.py b/metadata.py
@@ -81,7 +81,7 @@ def _discover_fields():
         yield 'Author-Email', discovery.author_from_vcs()
         yield 'Summary', discovery.summary_from_github()
         yield 'Requires-Python', discovery.python_requires_supported()
-        deps = list(discovery.declared_deps())
+        deps = list(discovery.combined_deps())
         for dep in deps:
             yield 'Requires-Dist', dep
         for extra in discovery.full_extras(discovery.extras_from_deps(deps)):