From 18cba63d439d8e76fa18c9d414e0dc32b8d8b892 Mon Sep 17 00:00:00 2001 From: Jim Madge Date: Mon, 24 Jul 2023 11:48:07 +0100 Subject: [PATCH] Improve version specification --- data_safe_haven/__about__.py | 3 ++- data_safe_haven/__init__.py | 5 +++-- pyproject.toml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/data_safe_haven/__about__.py b/data_safe_haven/__about__.py index d123ede027..29d532c3ff 100644 --- a/data_safe_haven/__about__.py +++ b/data_safe_haven/__about__.py @@ -1 +1,2 @@ -__version__ = "v0.4.0" +__version_info__ = ('5', '0', '0') +__version__ = '.'.join(__version_info__) diff --git a/data_safe_haven/__init__.py b/data_safe_haven/__init__.py index bd007957f9..f0a613dc08 100644 --- a/data_safe_haven/__init__.py +++ b/data_safe_haven/__init__.py @@ -1,4 +1,5 @@ """Data Safe Haven""" -import pkg_resources -__version__ = pkg_resources.get_distribution("data-safe-haven").version +from .version import __version__, __version_info__ + +__all__ = ["__version__", "__version_info__"] diff --git a/pyproject.toml b/pyproject.toml index 319706f0d4..36ce33a70d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,7 +50,7 @@ dependencies = [ dsh = "data_safe_haven.cli:main" [tool.hatch.version] -path = "data_safe_haven/__about__.py" +path = "data_safe_haven/version.py" [tool.hatch.envs.lint] detached = true