From 25217f73fed886d67b28d6eb2089b58d8b676938 Mon Sep 17 00:00:00 2001 From: Markus Rosenstihl Date: Sat, 4 Jul 2026 16:36:29 +0200 Subject: [PATCH] Unified versioning information and bumped version to 0.20. Now we only need to change src/damaris/__init__.py and use dch -v $VERSION to make a new version. --- debian/changelog | 7 +++++++ debian/files | 4 ++-- doc/conf.py | 7 ++++--- pyproject.toml | 5 ++++- src/damaris/__init__.py | 1 + src/damaris/gui/DamarisGUI.py | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d343c8..de9ea82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python3-damaris (0.20) stable; urgency=medium + + * Unified version management across Python app, GUI and documentation + * version bump + + -- Markus Rosenstihl Sat, 04 Jul 2026 16:33:31 +0200 + python3-damaris (0.19) stable; urgency=medium * JBs python3-damaris code adapted to new python3 syntax diff --git a/debian/files b/debian/files index c56a152..153d838 100644 --- a/debian/files +++ b/debian/files @@ -1,2 +1,2 @@ -python3-damaris_0.19_all.deb science optional -python3-damaris_0.19_amd64.buildinfo science optional +python3-damaris_0.20_all.deb science optional +python3-damaris_0.20_amd64.buildinfo science optional diff --git a/doc/conf.py b/doc/conf.py index 485bb67..704d8b8 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -3,7 +3,8 @@ # For the full list of built-in configuration values, see the documentation: # https://www.sphinx-doc.org/en/master/usage/configuration.html import sys,os -#sys.path.insert(0, os.path.abspath('../src')) +sys.path.insert(0, os.path.abspath('../src')) +import damaris # -- Project information ----------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information @@ -12,8 +13,8 @@ project = 'DAMARIS' copyright = '2026, Markus Rosenstihl' author = 'Markus Rosenstihl' -version = '0.19' -release = '0.19' +version = damaris.__version__ +release = damaris.__version__ # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/pyproject.toml b/pyproject.toml index 66fd8ab..6977ac8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta" [project] requires-python = ">= 3.9" name = "python3-damaris" -version = "0.19" +dynamic = ["version"] description = "Python version 3 frontend for DAMARIS (DArmstadt MAgnetic Resonance Instrument Software)" license = {text = "GPL-2.0"} keywords = ["NMR", "data-processing"] @@ -41,6 +41,9 @@ where = ["src"] [tool.setuptools.package-data] "damaris.gui" = ["DAMARIS3.png", "DAMARIS3.ico", "damaris.xml", "python.xml", "damaris3.glade"] +[tool.setuptools.dynamic] +version = {attr = "damaris.__version__"} + [tool.setuptools.data-files] "share/python3-damaris/images" = ["src/damaris/gui/DAMARIS3.png", "src/damaris/gui/DAMARIS3.ico"] #"share/python3-damaris/doc" = ["doc/index.html"] diff --git a/src/damaris/__init__.py b/src/damaris/__init__.py index 4baf7a6..cc71744 100644 --- a/src/damaris/__init__.py +++ b/src/damaris/__init__.py @@ -15,4 +15,5 @@ ## module contents # +__version__ = "0.20" __all__=["experiments", "data", "gui"] diff --git a/src/damaris/gui/DamarisGUI.py b/src/damaris/gui/DamarisGUI.py index ce60797..801eb8e 100644 --- a/src/damaris/gui/DamarisGUI.py +++ b/src/damaris/gui/DamarisGUI.py @@ -67,7 +67,7 @@ from damaris.data import DataPool, Accumulation, ADC_Result, MeasurementResult debug = False # version info -__version__ = "0.19" +from damaris import __version__ class logstream: