Merge pull request #84 from braingram/bug/entry_points_version_conflict

spacetelescope · Mar 6, 2023 · 67e8071 · 67e8071
2 parents 656bbfa + 801e55b
commit 67e8071
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,7 +1,8 @@
 0.4.6 (unreleased)
 ==================
 
--
+- add ``importlib.metadata`` as a dependency and update loading of entry_points to drop
+  usage of pkg_resources [#84]
 
 0.4.5 (2022-12-23)
 ==================

diff --git a/pyproject.toml b/pyproject.toml
@@ -16,6 +16,7 @@ dependencies = [
     'crds>=7.4.1.3',
     'astropy>=5.0.4',
     'stdatamodels>=0.2.4',
+    'importlib_metadata>=4.11.4',
 ]
 dynamic = ['version']
 

diff --git a/src/stpipe/entry_points.py b/src/stpipe/entry_points.py
@@ -1,7 +1,8 @@
-from pkg_resources import iter_entry_points
 from collections import namedtuple
 import warnings
 
+from importlib_metadata import entry_points
+
 
 STEPS_GROUP = "stpipe.steps"
 
@@ -23,8 +24,8 @@ class alias, and the third is a bool indicating whether the class is to be
     """
     steps = []
 
-    for entry_point in iter_entry_points(group=STEPS_GROUP):
-        package_name = entry_point.dist.project_name
+    for entry_point in entry_points(group=STEPS_GROUP):
+        package_name = entry_point.dist.name
         package_version = entry_point.dist.version
         package_steps = []