From de842aad182c74de21d09d108050740affb94f2e Mon Sep 17 00:00:00 2001 From: Nick Krabbenhoeft Date: Fri, 4 Aug 2023 13:20:39 -0400 Subject: [PATCH 1/2] move to importlib --- bagit.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bagit.py b/bagit.py index a27780c..3db74a3 100755 --- a/bagit.py +++ b/bagit.py @@ -21,7 +21,7 @@ from functools import partial from os.path import abspath, isdir, isfile, join -from pkg_resources import DistributionNotFound, get_distribution +from importlib.metadata import version try: from urllib.parse import urlparse @@ -48,9 +48,8 @@ def find_locale_dir(): LOGGER = logging.getLogger(MODULE_NAME) -try: - VERSION = get_distribution(MODULE_NAME).version -except DistributionNotFound: +VERSION = version(MODULE_NAME) +if not VERSION: VERSION = "0.0.dev0" PROJECT_URL = "https://github.com/LibraryOfCongress/bagit-python" From 86cdf3972d78a51bef8741e08949075ca54b6341 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Wed, 24 Jan 2024 14:08:56 +0100 Subject: [PATCH 2/2] install/use importlib_metadata for py < 3.8 --- bagit.py | 5 ++++- setup.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bagit.py b/bagit.py index 3db74a3..9b55365 100755 --- a/bagit.py +++ b/bagit.py @@ -21,7 +21,10 @@ from functools import partial from os.path import abspath, isdir, isfile, join -from importlib.metadata import version +try: + from importlib.metadata import version +except ImportError: + from importlib_metadata import version try: from urllib.parse import urlparse diff --git a/setup.py b/setup.py index c51a55a..4bf8f5b 100644 --- a/setup.py +++ b/setup.py @@ -62,6 +62,7 @@ def get_message_catalogs(): platforms=["POSIX"], test_suite="test", setup_requires=["setuptools_scm"], + install_requires=["importlib_metadata ; python_version < '3.8'"], tests_require=tests_require, classifiers=[ "License :: Public Domain",