source_info: resolve importlib_metadata compatibility issues

Signed-off-by: Eric Callahan <[email protected]>
Arksine · Jul 25, 2024 · 8debbf8 · 8debbf8
1 parent 6f2c79f
commit 8debbf8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/moonraker/utils/source_info.py b/moonraker/utils/source_info.py
@@ -13,10 +13,7 @@
 import json
 import logging
 from dataclasses import dataclass
-if sys.version_info < (3, 8):
-    from importlib_metadata import Distribution, PathDistribution, PackageMetadata
-else:
-    from importlib.metadata import Distribution, PathDistribution, PackageMetadata
+from importlib_metadata import Distribution, PathDistribution, PackageMetadata
 from .exceptions import ServerError
 
 # Annotation imports

diff --git a/pyproject.toml b/pyproject.toml
@@ -25,7 +25,8 @@ dependencies = [
     "apprise==1.8.0",
     "ldap3==2.9.1",
     "python-periphery==2.4.1",
-    "importlib_metadata==6.7.0 ; python_version=='3.7'"
+    "importlib_metadata==6.7.0 ; python_version=='3.7'",
+    "importlib_metadata==8.2.0 ; python_version>='3.8'"
 ]
 requires-python = ">=3.7"
 readme = "README.md"

diff --git a/scripts/moonraker-requirements.txt b/scripts/moonraker-requirements.txt
@@ -20,3 +20,4 @@ apprise==1.8.0
 ldap3==2.9.1
 python-periphery==2.4.1
 importlib_metadata==6.7.0 ; python_version=='3.7'
+importlib_metadata==8.2.0 ; python_version>='3.8'