From 8debbf8ba477064b77e16be7c0d9d3d3c2be1c07 Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Thu, 25 Jul 2024 14:16:42 -0400 Subject: [PATCH] source_info: resolve importlib_metadata compatibility issues Signed-off-by: Eric Callahan --- moonraker/utils/source_info.py | 5 +---- pyproject.toml | 3 ++- scripts/moonraker-requirements.txt | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/moonraker/utils/source_info.py b/moonraker/utils/source_info.py index 061756d..a9c75a3 100644 --- a/moonraker/utils/source_info.py +++ b/moonraker/utils/source_info.py @@ -13,10 +13,7 @@ import re 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 index 0103503..b283991 100644 --- 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 index 8ac96b3..4e3e3f1 100644 --- 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'