From 8f4dfd1a839b7381660de8695508a0b50257f3f5 Mon Sep 17 00:00:00 2001 From: Tamas Gal <himself@tamasgal.com> Date: Sun, 8 Oct 2023 23:20:43 +0200 Subject: [PATCH] Use importlib instead of the deprecated pkg_resources --- {{cookiecutter.project_slug}}/doc/conf.py | 9 ++++++--- .../src/{{cookiecutter.project_slug}}/__init__.py | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/{{cookiecutter.project_slug}}/doc/conf.py b/{{cookiecutter.project_slug}}/doc/conf.py index b25bab7..80a23ff 100644 --- a/{{cookiecutter.project_slug}}/doc/conf.py +++ b/{{cookiecutter.project_slug}}/doc/conf.py @@ -17,11 +17,14 @@ import sys import os from datetime import date import sphinx_rtd_theme -from pkg_resources import get_distribution +try: + from importlib.metadata import version as get_version + version = get_version('{{cookiecutter.project_slug}}') +except ImportError: + from pkg_resources import get_distribution + version = get_distribution('{{cookiecutter.project_slug}}').version # -- Project information ----------------------------------------------------- - -version = get_distribution('{{cookiecutter.project_slug}}').version short_version = '.'.join(version.split('.')[:2]) project = '{{cookiecutter.project_slug}} {}'.format(short_version) copyright = '{0}, {{cookiecutter.author}}'.format(date.today().year) diff --git a/{{cookiecutter.project_slug}}/src/{{cookiecutter.project_slug}}/__init__.py b/{{cookiecutter.project_slug}}/src/{{cookiecutter.project_slug}}/__init__.py index 62b4475..16e1555 100644 --- a/{{cookiecutter.project_slug}}/src/{{cookiecutter.project_slug}}/__init__.py +++ b/{{cookiecutter.project_slug}}/src/{{cookiecutter.project_slug}}/__init__.py @@ -1,5 +1,8 @@ -from pkg_resources import get_distribution, DistributionNotFound - -version = get_distribution(__name__).version +try: + from importlib.metadata import version as get_version + version = get_version(__name__) +except ImportError: + from pkg_resources import get_distribution + version = get_distribution(__name__).version from .calc import Calculator -- GitLab