Merge pull request #5316 from gijzelaerr/fix-outdated-pkg-resources-usage

jmcrawford45 · web-flow · commit cf4ad29a2414 · 2025-09-17T13:00:45.000-04:00
Fix outdated pkg resources usage by replacing with importlib (fix #5315)
diff --git a/lemur/factory.py b/lemur/factory.py
@@ -258,7 +258,7 @@ def install_plugins(app):
     from lemur.plugins import plugins
     from lemur.plugins.base import register
 
-    for ep in entry_points().get("lemur.plugins", []):
+    for ep in entry_points(group="lemur.plugins"):
         try:
             plugin = ep.load()
         except Exception:
diff --git a/lemur/plugins/base/v1.py b/lemur/plugins/base/v1.py
@@ -45,7 +45,7 @@ class IPlugin(local):
     title: Optional[str] = None
     slug: Optional[str] = None
     description: Optional[str] = None
-    version = None
+    version: Optional[str] = None
     author: Optional[str] = None
     author_url: Optional[str] = None
     resource_links = ()
diff --git a/lemur/plugins/lemur_acme/__init__.py b/lemur/plugins/lemur_acme/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_adcs/__init__.py b/lemur/plugins/lemur_adcs/__init__.py
@@ -1,5 +1,6 @@
 """Set the version information."""
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_atlas/__init__.py b/lemur/plugins/lemur_atlas/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_atlas_redis/__init__.py b/lemur/plugins/lemur_atlas_redis/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_aws/__init__.py b/lemur/plugins/lemur_aws/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_azure_dest/__init__.py b/lemur/plugins/lemur_azure_dest/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_cfssl/__init__.py b/lemur/plugins/lemur_cfssl/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_cryptography/__init__.py b/lemur/plugins/lemur_cryptography/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_csr/__init__.py b/lemur/plugins/lemur_csr/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_digicert/__init__.py b/lemur/plugins/lemur_digicert/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_email/__init__.py b/lemur/plugins/lemur_email/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_entrust/__init__.py b/lemur/plugins/lemur_entrust/__init__.py
@@ -1,5 +1,6 @@
 """Set the version information."""
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_google_ca/__init__.py b/lemur/plugins/lemur_google_ca/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_jks/__init__.py b/lemur/plugins/lemur_jks/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_kubernetes/__init__.py b/lemur/plugins/lemur_kubernetes/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_openssl/__init__.py b/lemur/plugins/lemur_openssl/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_sftp/__init__.py b/lemur/plugins/lemur_sftp/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_slack/__init__.py b/lemur/plugins/lemur_slack/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_statsd/lemur_statsd/__init__.py b/lemur/plugins/lemur_statsd/lemur_statsd/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "Unknown"
diff --git a/lemur/plugins/lemur_vault_dest/__init__.py b/lemur/plugins/lemur_vault_dest/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
diff --git a/lemur/plugins/lemur_verisign/__init__.py b/lemur/plugins/lemur_verisign/__init__.py
@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"
