From d0d9332cca58f72af8a99412e2b56c5f6658dcee Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 1 Oct 2022 22:01:14 -0400 Subject: [PATCH 1/2] fix compatible with importlib_metadata --- dpdata/plugins/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dpdata/plugins/__init__.py b/dpdata/plugins/__init__.py index 4887501ca..74f72fe08 100644 --- a/dpdata/plugins/__init__.py +++ b/dpdata/plugins/__init__.py @@ -14,6 +14,6 @@ importlib.import_module(module_name, PACKAGE_BASE) # https://setuptools.readthedocs.io/en/latest/userguide/entry_point.html -eps = metadata.entry_points().get('dpdata.plugins', []) +eps = metadata.entry_points(group='dpdata.plugins') for ep in eps: plugin = ep.load() From a7ce7bf620125eece15175363ad406a716a50db9 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 1 Oct 2022 22:07:11 -0400 Subject: [PATCH 2/2] compatible with old usage --- dpdata/plugins/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dpdata/plugins/__init__.py b/dpdata/plugins/__init__.py index 74f72fe08..ca097fd75 100644 --- a/dpdata/plugins/__init__.py +++ b/dpdata/plugins/__init__.py @@ -14,6 +14,9 @@ importlib.import_module(module_name, PACKAGE_BASE) # https://setuptools.readthedocs.io/en/latest/userguide/entry_point.html -eps = metadata.entry_points(group='dpdata.plugins') +try: + eps = metadata.entry_points(group='dpdata.plugins') +except TypeError: + eps = metadata.entry_points().get('dpdata.plugins', []) for ep in eps: plugin = ep.load()