plugin entrypoint compatibility fix for python 3.7 (psyplot#47)

Chilipp · web-flow · commit 34480534c5a1 · 2022-02-13T22:08:19.000+01:00
* plugin entrypoint compatibility fix for python 3.7

* use psyplot-ci-orb@1.5.31

* [skip ci] update changelog
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  psyplot: psyplot/psyplot-ci-orb@1.5.29
+  psyplot: psyplot/psyplot-ci-orb@1.5.31
   mattermost-plugin-notify: nathanaelhoun/mattermost-plugin-notify@1.2.0
 
 executors:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,7 @@
+v1.4.2
+======
+Fix for compatibility with python 3.7
+
 v1.4.1
 ======
 Compatibility fixes and minor improvements
diff --git a/psyplot/__init__.py b/psyplot/__init__.py
@@ -123,14 +123,10 @@ def get_versions(requirements=True, key=None):
             }
         }
     """
-    from importlib.metadata import entry_points
-    ret = {'psyplot': _get_versions(requirements)}
+    from psyplot.utils import plugin_entrypoints
+    eps = plugin_entrypoints("psyplot", "plugin")
 
-    try:
-        eps = entry_points(group='psyplot', name='plugin')
-    except TypeError:  # python<3.10
-        eps = [ep for ep in entry_points().get('psyplot', [])
-                if ep.name ==  'plugin']
+    ret = {'psyplot': _get_versions(requirements)}
     for ep in eps:
         if str(ep) in rcParams._plugins:
             logger.debug('Loading entrypoint %s', ep)
diff --git a/psyplot/config/rcsetup.py b/psyplot/config/rcsetup.py
@@ -757,14 +757,17 @@ def _load_plugin_entrypoints(self):
         ------
         importlib.metadata.EntryPoint
             The entry point for the psyplot plugin module"""
-        from importlib.metadata import entry_points
+        from psyplot.utils import plugin_entrypoints
 
         def load_plugin(ep):
 
             try:
                 ep.module
             except AttributeError:  # python<3.10
-                ep.module = ep.pattern.match(ep.value).group("module")
+                try:
+                    ep.module = ep.pattern.match(ep.value).group("module")
+                except AttributeError: # python<3.8
+                    ep.module = ep.module_name
 
             if plugins_env == ['no']:
                 return False
@@ -782,11 +785,7 @@ def load_plugin(ep):
 
         logger = logging.getLogger(__name__)
 
-        try:
-            eps = entry_points(group='psyplot', name='plugin')
-        except TypeError:  # python<3.10
-            eps = [ep for ep in entry_points().get('psyplot', [])
-                   if ep.name ==  'plugin']
+        eps = plugin_entrypoints("psyplot", "plugin")
         for ep in eps:
             if not load_plugin(ep):
                 logger.debug('Skipping entrypoint %s', ep)
diff --git a/psyplot/utils.py b/psyplot/utils.py
@@ -23,6 +23,7 @@
 # You should have received a copy of the GNU LGPL-3.0 license
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import sys
 import re
 import six
 from difflib import get_close_matches
@@ -31,6 +32,21 @@
 from psyplot.docstring import dedent, docstrings
 
 
+def plugin_entrypoints(group="psyplot", name="name"):
+    """This utility function gets the entry points of the psyplot plugins"""
+    if sys.version_info[:2] > (3, 7):
+        from importlib.metadata import entry_points
+        try:
+            eps = entry_points(group=group, name=name)
+        except TypeError:  # python<3.10
+            eps = [ep for ep in entry_points().get(group, [])
+                   if ep.name ==  name]
+    else:
+        from pkg_resources import iter_entry_points
+        eps = iter_entry_points(group=group, name=name)
+    return eps
+
+
 class DefaultOrderedDict(OrderedDict):
     """An ordered :class:`collections.defaultdict`
 

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +v1.4.2
 +======
 +Fix for compatibility with python 3.7
++
 v1.4.1
 ======
 Compatibility fixes and minor improvements