From 6550d1c414a2511e9cf5d7c3aaf46d93620db0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20BRON=C3=88S?= <romain.brones@synchrotron-soleil.fr> Date: Thu, 29 Feb 2024 09:00:31 +0100 Subject: [PATCH] fix(version): Going backward on version handling * Source code is the master of version numbering, it then should be copied in git * Single source of version is __init__.py --- FofbTool/__init__.py | 2 +- Makefile | 10 ---------- setup.py | 4 ++-- 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 Makefile diff --git a/FofbTool/__init__.py b/FofbTool/__init__.py index 234c955..7f8c4e2 100644 --- a/FofbTool/__init__.py +++ b/FofbTool/__init__.py @@ -14,4 +14,4 @@ This package is cut in several modules: For basic usage, see doc of FofbTool.Utils """ -from FofbTool._version import version as __version__ +__version__ = "2.2.1" diff --git a/Makefile b/Makefile deleted file mode 100644 index 1989d8f..0000000 --- a/Makefile +++ /dev/null @@ -1,10 +0,0 @@ - - -VERSION: - echo version=\'$(shell git describe --tags | sed 's/\(.*\)-.*/\1/')\' > FofbTool/_version.py - -build: VERSION - python setup.py sdist - -clean: - rm -f FofbTool/_version.py diff --git a/setup.py b/setup.py index cd350db..d16c9cd 100755 --- a/setup.py +++ b/setup.py @@ -1,10 +1,10 @@ #!/usr/bin/env python from distutils.core import setup -from FofbTool._version import version +from FofbTool.__init__ import __version__ setup(name='FofbTool', - version=version, + version=__version__, description='Python module to operate and configure SOLEIL FOFB.', url='https://gitlab.synchrotron-soleil.fr/dg/fofb/fofbtool', license="GNU-GPL-v3", -- GitLab