From 66e2ef3e1b4427299ab26a9af96cd1809052b426 Mon Sep 17 00:00:00 2001 From: malteos Date: Fri, 22 Aug 2025 12:24:16 +0000 Subject: [PATCH 1/2] replacing the deprecated pkg_resources import with the modern importlib.metadata approach --- cdx_toolkit/__init__.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cdx_toolkit/__init__.py b/cdx_toolkit/__init__.py index c27845a..6d8978a 100644 --- a/cdx_toolkit/__init__.py +++ b/cdx_toolkit/__init__.py @@ -1,10 +1,15 @@ import logging import json -from pkg_resources import get_distribution, DistributionNotFound from collections.abc import MutableMapping import sys import warnings +try: + from importlib.metadata import version, PackageNotFoundError +except ImportError: + # Python < 3.8 compatibility + from importlib_metadata import version, PackageNotFoundError + __version__ = 'installed-from-git' from .myrequests import myrequests_get @@ -17,8 +22,8 @@ try: # this works for the pip-installed package - __version__ = get_distribution(__name__).version -except DistributionNotFound: # pragma: no cover + __version__ = version(__name__) +except PackageNotFoundError: # pragma: no cover pass From da865e9ac1b6de7bfae931b9354a7c314e25957f Mon Sep 17 00:00:00 2001 From: malteos Date: Mon, 22 Sep 2025 14:33:51 +0200 Subject: [PATCH 2/2] ignore coverage --- cdx_toolkit/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdx_toolkit/__init__.py b/cdx_toolkit/__init__.py index 6d8978a..ea716c7 100644 --- a/cdx_toolkit/__init__.py +++ b/cdx_toolkit/__init__.py @@ -6,9 +6,9 @@ try: from importlib.metadata import version, PackageNotFoundError -except ImportError: +except ImportError: # pragma: no cover # Python < 3.8 compatibility - from importlib_metadata import version, PackageNotFoundError + from importlib_metadata import version, PackageNotFoundError # pragma: no cover __version__ = 'installed-from-git'