pytest-girder 3.2.9.dev12__tar.gz → 3.2.9.dev16__tar.gz

{pytest_girder-3.2.9.dev12 → pytest_girder-3.2.9.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytest-girder
-Version: 3.2.9.dev12
+Version: 3.2.9.dev16
 Summary: A set of pytest fixtures for testing Girder applications.
 Author: Kitware, Inc.
 Author-email: kitware@kitware.com
@@ -13,3 +13,11 @@ Requires-Dist: mongomock
 Requires-Dist: pytest>=3.6
 Requires-Dist: pytest-cov
 Requires-Dist: pymongo
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

{pytest_girder-3.2.9.dev12 → pytest_girder-3.2.9.dev16}/pytest_girder/plugin_registry.py

@@ -1,7 +1,8 @@
 import distutils
 from contextlib import contextmanager
+import email.parser
 import io
-from pkg_resources import iter_entry_points
+import importlib.metadata
 from tempfile import gettempdir
 import unittest.mock
 
@@ -13,6 +14,10 @@ class _MockDistribution:
         self.location = location or gettempdir()
         self._metadata = self._generateMetadata(name, version, description, url)
 
+    @property
+    def metadata(self):
+        return self._meta.__dict__
+
     def get_metadata(self, *args, **kwargs):
         return self._metadata
 
@@ -27,11 +32,14 @@ class _MockDistribution:
         meta.provides_extras = ()
         meta.license_file = None
         meta.license_files = None
+        meta.license_expression = None
         meta.install_requires = []
         meta.extras_require = {}
         pkgInfo = io.StringIO()
         meta.write_pkg_file(pkgInfo)
-        return pkgInfo.getvalue()
+        self._meta = meta
+        pkgInfo.seek(0)
+        return {k: v for k, v in email.parser.Parser().parse(pkgInfo).items()}
 
 
 class _MockEntryPoint:
@@ -65,9 +73,22 @@ class PluginRegistry:
     def registerEntrypoint(self, entryPoint):
         self._plugins.append(entryPoint)
 
-    def _iter_entry_points(self, *args, **kwargs):
+    def _listPluginEntryPoints(self, *args, **kwargs):
         if self._include_installed_plugins:
-            yield from iter_entry_points(*args, **kwargs)
+            kwargs = kwargs.copy()
+            kwargs['group'] = 'girder.plugin'
+            if len(args):
+                kwargs['group'] = args[0]
+                if len(args) > 1:
+                    kwargs['name'] = args[1]
+            if hasattr(importlib.metadata.entry_points(), 'select'):
+                yield from importlib.metadata.entry_points().select(**kwargs)
+            else:
+                for epk in importlib.metadata.entry_points():
+                    for ep in importlib.metadata.entry_points()[epk]:
+                        if (ep.group == kwargs['group']
+                                and ep.name == kwargs.get('name', ep.name)):
+                            yield ep
         yield from self._plugins
 
     @contextmanager
@@ -76,7 +97,8 @@ class PluginRegistry:
 
         try:
             with unittest.mock.patch.object(
-                    plugin, 'iter_entry_points', side_effect=self._iter_entry_points) as mock_:
+                    plugin, '_listPluginEntryPoints',
+                    side_effect=self._listPluginEntryPoints) as mock_:
                 yield mock_
         finally:
             plugin._pluginRegistry = None

{pytest_girder-3.2.9.dev12 → pytest_girder-3.2.9.dev16}/pytest_girder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytest-girder
-Version: 3.2.9.dev12
+Version: 3.2.9.dev16
 Summary: A set of pytest fixtures for testing Girder applications.
 Author: Kitware, Inc.
 Author-email: kitware@kitware.com
@@ -13,3 +13,11 @@ Requires-Dist: mongomock
 Requires-Dist: pytest>=3.6
 Requires-Dist: pytest-cov
 Requires-Dist: pymongo
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary