From d3f4654d4b5d620cdb2c9926eee911116c35c74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 20 Feb 2023 09:29:38 -0800 Subject: [PATCH] python: replace pkg_resources with importlib.metadata Use of pkg_resources is discouraged in favor of importlib.resources, importlib.metadata, and their backports. --- python/pyproject.toml | 1 + python/src/deltachat/__init__.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index 4aa6666db..227fb73d2 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -21,6 +21,7 @@ classifiers = [ dependencies = [ "cffi>=1.0.0", "imap-tools", + "importlib_metadata;python_version<'3.8'", "pluggy", "requests", ] diff --git a/python/src/deltachat/__init__.py b/python/src/deltachat/__init__.py index 048d8e3a7..3d2734cca 100644 --- a/python/src/deltachat/__init__.py +++ b/python/src/deltachat/__init__.py @@ -1,6 +1,9 @@ import sys -from pkg_resources import DistributionNotFound, get_distribution +if sys.version_info >= (3, 8): + from importlib.metadata import PackageNotFoundError, version +else: + from importlib_metadata import PackageNotFoundError, version from . import capi, events, hookspec # noqa from .account import Account, get_core_info # noqa @@ -11,8 +14,8 @@ from .hookspec import account_hookimpl, global_hookimpl # noqa from .message import Message # noqa try: - __version__ = get_distribution(__name__).version -except DistributionNotFound: + __version__ = version(__name__) +except PackageNotFoundError: # package is not installed __version__ = "0.0.0.dev0-unknown"