From cdefe37aa4e33d2f42d6a87b137c62e4734edfa9 Mon Sep 17 00:00:00 2001 From: Midnighter Date: Thu, 15 Oct 2020 16:28:01 +0200 Subject: [PATCH] fix: change version retrieval --- setup.cfg | 1 + src/structurizr/api/structurizr_client_settings.py | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 6bd1e6de..1f5a49a2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,6 +36,7 @@ zip_safe = True install_requires = depinfo httpx + importlib_metadata; python_version <'3.8' ordered-set pydantic python-dotenv diff --git a/src/structurizr/api/structurizr_client_settings.py b/src/structurizr/api/structurizr_client_settings.py index c55668cf..552f68c5 100644 --- a/src/structurizr/api/structurizr_client_settings.py +++ b/src/structurizr/api/structurizr_client_settings.py @@ -21,9 +21,13 @@ from pathlib import Path from socket import getfqdn -from pydantic import UUID4, BaseSettings, DirectoryPath, Field, HttpUrl -from .. import __version__ +try: + from importlib.metadata import version +except ModuleNotFoundError: + from importlib_metadata import version + +from pydantic import UUID4, BaseSettings, DirectoryPath, Field, HttpUrl __all__ = ("StructurizrClientSettings",) @@ -44,7 +48,7 @@ if hostname: USER = f"{USER}@{hostname}" -AGENT = f"structurizr-python/{__version__}" +AGENT = f"structurizr-python/{version('structurizr-python')}" class StructurizrClientSettings(BaseSettings):