From 16e68ad2840a8e9933e7194241061d0deae204b3 Mon Sep 17 00:00:00 2001 From: Spitap Date: Sat, 22 Apr 2023 17:46:33 +0200 Subject: [PATCH] Updated version --- modoboa/__init__.py | 2 +- modoboa/version.py | 10 ++++++++++ pyproject.toml | 5 ++++- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 modoboa/version.py diff --git a/modoboa/__init__.py b/modoboa/__init__.py index 1b52c3b1e..bd516d64a 100644 --- a/modoboa/__init__.py +++ b/modoboa/__init__.py @@ -1,7 +1,6 @@ """Modoboa - Mail hosting made simple.""" from pkg_resources import DistributionNotFound, get_distribution -from modoboa.core.commands import handle_command_line try: __version__ = get_distribution(__name__).version @@ -10,4 +9,5 @@ except DistributionNotFound: pass def modoboa_admin(): + from modoboa.core.commands import handle_command_line handle_command_line() diff --git a/modoboa/version.py b/modoboa/version.py new file mode 100644 index 000000000..bb0278e0c --- /dev/null +++ b/modoboa/version.py @@ -0,0 +1,10 @@ +import os + +def get_version(): + from setuptools_scm import get_version as default_version + github_version = os.environ.get('GITHUB_REF_NAME', None) + if github_version is not None: + return github_version + + return default_version() + diff --git a/pyproject.toml b/pyproject.toml index 86353e4d7..ba0c0b3f5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=61.0"] +requires = ["setuptools>=61.0", "setuptools_scm[toml]>=6.2"] build-backend = "setuptools.build_meta" [project] @@ -89,3 +89,6 @@ modoboa-cli = "modoboa:modoboa_admin" homepage = "http://modoboa.org/" documentation = "https://modoboa.readthedocs.io/en/latest/" repository = "https://github.com/modoboa/modoboa" + +[tool.setuptools.dynamic] +version = {attr = "modoboa.version.get_version"}