From 54b253ccd9d7e9626d8236ec4a8a32631ff2fca2 Mon Sep 17 00:00:00 2001 From: Ben Bruers Date: Wed, 4 Feb 2026 11:12:52 +0100 Subject: [PATCH 1/2] remove dependency for pkg_resources --- remi/__init__.py | 33 ++++++++++++++++++++++++++++----- setup.py | 2 +- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/remi/__init__.py b/remi/__init__.py index 74378e4f..476d520f 100644 --- a/remi/__init__.py +++ b/remi/__init__.py @@ -31,10 +31,33 @@ ) from .server import App, Server, start -from pkg_resources import get_distribution, DistributionNotFound +# importlib.metadata is available in Python 3.8+ +useForVersionCheck = None try: - __version__ = get_distribution(__name__).version -except DistributionNotFound: - # package is not installed - pass + import importlib.metadata + useForVersionCheck = "importlib.metadata" +except ImportError: + try: + import pkg_resources + useForVersionCheck = "pkg_resources" + except ImportError: + pass + +if useForVersionCheck == "importlib.metadata": + from importlib.metadata import version, PackageNotFoundError + try: + __version__ = version(__name__) + except PackageNotFoundError: + # package is not installed + pass +elif useForVersionCheck == "pkg_resources": + from pkg_resources import get_distribution, DistributionNotFound + try: + __version__ = get_distribution(__name__).version + except DistributionNotFound: + # package is not installed + pass +else: + # neither importlib.metadata nor pkg_resources is available + pass \ No newline at end of file diff --git a/setup.py b/setup.py index ffcda9aa..259647d8 100644 --- a/setup.py +++ b/setup.py @@ -27,5 +27,5 @@ except: del params['setup_requires'] params['use_scm_version'] = False - params['version'] = '2022.7.27' + params['version'] = '2026.02.04' setup(**params) From 8da5b89a3f230bff96478c40b6a94f25eece3e6b Mon Sep 17 00:00:00 2001 From: Ben Bruers Date: Wed, 4 Feb 2026 11:27:09 +0100 Subject: [PATCH 2/2] print warning if neither package available --- remi/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remi/__init__.py b/remi/__init__.py index 476d520f..77b27cf8 100644 --- a/remi/__init__.py +++ b/remi/__init__.py @@ -60,4 +60,4 @@ pass else: # neither importlib.metadata nor pkg_resources is available - pass \ No newline at end of file + print("WARNING: cannot check remi version, please install importlib-metadata (python >= 3.8) or the pkg_resources module by installing setuptools") \ No newline at end of file