From 4bd4cf5dd45734c94cb8d56c8c888062d1cc1bf7 Mon Sep 17 00:00:00 2001 From: Brian Helba Date: Mon, 25 Oct 2021 13:14:45 -0400 Subject: [PATCH 1/2] Use importlib.metadata instead of pkg_resources to get version --- configurations/version.py | 6 +++--- setup.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configurations/version.py b/configurations/version.py index 137cb24..5f2c59d 100644 --- a/configurations/version.py +++ b/configurations/version.py @@ -1,7 +1,7 @@ -from pkg_resources import get_distribution, DistributionNotFound +from importlib.metadata import PackageNotFoundError, version try: - __version__ = get_distribution("django-configurations").version -except DistributionNotFound: + __version__ = version("django-configurations") +except PackageNotFoundError: # package is not installed __version__ = None diff --git a/setup.py b/setup.py index f311665..05f769e 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,6 @@ setup( }, install_requires=[ 'django>=2.2', - 'setuptools', ], extras_require={ 'cache': ['django-cache-url'], From f5d6ef787737daec3174e9b657a42addf415826a Mon Sep 17 00:00:00 2001 From: Brian Helba Date: Mon, 25 Oct 2021 13:38:57 -0400 Subject: [PATCH 2/2] Add importlib.metadata backport for older Python versions --- configurations/version.py | 5 ++++- setup.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configurations/version.py b/configurations/version.py index 5f2c59d..0ff5d02 100644 --- a/configurations/version.py +++ b/configurations/version.py @@ -1,4 +1,7 @@ -from importlib.metadata import PackageNotFoundError, version +try: + from importlib.metadata import PackageNotFoundError, version +except ImportError: + from importlib_metadata import PackageNotFoundError, version try: __version__ = version("django-configurations") diff --git a/setup.py b/setup.py index 05f769e..784c780 100644 --- a/setup.py +++ b/setup.py @@ -28,6 +28,7 @@ setup( }, install_requires=[ 'django>=2.2', + 'importlib-metadata;python_version<"3.8"', ], extras_require={ 'cache': ['django-cache-url'],