Merge branch 'use-standard-entry-point' into 'master'

Use entry point with importlib

Closes #80

See merge request limagroup/Lima-tango-python!129

Author: sdebionne

Lima/Server/EnvHelper.py

@@ -21,6 +21,8 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 ############################################################################
 
+from __future__ import annotations
+
 import sys
 import os
 import re
@@ -31,11 +33,6 @@
 
 import PyTango
 
-try:
-    import pkg_resources
-except ImportError:
-    pkg_resources = None
-
 
 ModDepend = ["Core", "Espia"]
 Debug = 0
@@ -428,10 +425,29 @@ def _import(name):
     return sys.modules[name]
 
 
-def get_entry_point(group, name):
-    # try to find an extension using setuptools entry points
-    if pkg_resources is None:
+def get_entry_point(group: str, name: str):
+    """
+    Try to find an extension using entry points.
+    """
+    try:
+        from importlib.metadata import entry_points
+    except ImportError:
+        pass
+    else:
+        eps = entry_points()
+        plugins = eps.select(group=group, name=name)
+        if not plugins:
+            return None
+        elif len(plugins) > 1:
+            raise ValueError("found more than one entry point matching {}".format(name))
+        return plugins[0]
+
+    # Here is the old way to import plugins
+    try:
+        import pkg_resources
+    except ImportError:
         return None
+
     entry_points = tuple(pkg_resources.iter_entry_points(group, name))
     if not entry_points:
         return None
@@ -440,7 +456,7 @@ def get_entry_point(group, name):
     return entry_points[0]
 
 
-def get_camera_module(name):
+def get_camera_module(name: str):
     """Returns the python module for the given camera type"""
     entry_point = get_entry_point("Lima_tango_camera", name)
     if entry_point is None:
@@ -450,7 +466,7 @@ def get_camera_module(name):
     return entry_point.load()
 
 
-def get_plugin_module(name):
+def get_plugin_module(name: str):
     """Returns the python module for the given plugin type"""
     entry_point = get_entry_point("Lima_tango_plugin", name)
     if entry_point is None:

Lima/Server/camera/__init__.py

@@ -36,13 +36,27 @@ def _init_module():
                 if subdir:
                     base = "%s.%s" % (subdir, base)
                 cameras.append(base)
+
+    # New way to import entry points
     try:
-        import pkg_resources
+        from importlib.metadata import entry_points
     except ImportError:
         pass
+        # Old way to import entry points
+        try:
+            import pkg_resources
+        except ImportError:
+            pass
+        else:
+            for ep in pkg_resources.iter_entry_points("Lima_tango_camera"):
+                cameras.append(ep.name)
     else:
         for ep in pkg_resources.iter_entry_points("Lima_tango_camera"):
             cameras.append(ep.name)
+        eps = entry_points()
+        for entry_point in eps.select(group="Lima_tango_camera"):
+            cameras.append(entry_point.value)
+
     return cameras
 
 

Lima/Server/plugins/__init__.py

@@ -21,11 +21,13 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 ############################################################################
 
+from __future__ import annotations
 
-def _init_module():
+
+def _init_module() -> list[str]:
     import os
 
-    plugins = []
+    plugins: list[str] = []
     for root, dirs, files in os.walk(__path__[0], followlinks=True):
         for file_name in files:
             if file_name.startswith("__"):
@@ -36,13 +38,23 @@ def _init_module():
                 if subdir:
                     base = "%s.%s" % (subdir, base)
                 plugins.append(base)
+
+    # New way to import entry points
     try:
-        import pkg_resources
+        from importlib.metadata import entry_points
     except ImportError:
-        pass
+        # Old way to import entry points
+        try:
+            import pkg_resources
+        except ImportError:
+            pass
+        else:
+            for ep in pkg_resources.iter_entry_points("Lima_tango_plugin"):
+                plugins.append(ep.name)
     else:
-        for ep in pkg_resources.iter_entry_points("Lima_tango_plugin"):
-            plugins.append(ep.name)
+        eps = entry_points()
+        for entry_point in eps.select(group="Lima_tango_plugin"):
+            plugins.append(entry_point.value)
 
     return plugins