From c3714bf4212681910b287ae4200b109a28596cbb Mon Sep 17 00:00:00 2001
From: Yngve Levinsen <yngve.levinsen@ess.eu>
Date: Wed, 11 Nov 2020 08:21:30 +0100
Subject: [PATCH] using newer solution to fetch package version also fixed
ess.__name__ see
https://packaging.python.org/guides/single-sourcing-package-version/
---
ess/__init__.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/ess/__init__.py b/ess/__init__.py
index 9e372a3..2023c67 100644
--- a/ess/__init__.py
+++ b/ess/__init__.py
@@ -3,7 +3,12 @@ from . import installed
from . import lib_tw
from . import fieldmap
from .nextcloud import nextcloud
-from pkg_resources import get_distribution, DistributionNotFound
+
+try:
+ from importlib import metadata
+except ImportError:
+ # Running on pre-3.8 Python; use importlib-metadata package
+ import importlib_metadata as metadata # type: ignore
__all__ = [
"fieldmap",
@@ -15,10 +20,10 @@ __all__ = [
"nextcloud",
]
-__name__ = "ess"
+__name__ = "ess-python-tools"
try:
- __version__ = get_distribution(__name__).version
-except DistributionNotFound:
+ __version__ = metadata.version(__name__)
+except metadata.PackageNotFoundError:
# package is not installed
pass
--
GitLab