From 827291fc44e1902a9f7f51c5c44ed2ba95f4c32b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20BRON=C3=88S?= <romain.brones@synchrotron-soleil.fr>
Date: Tue, 20 Feb 2024 11:45:41 +0100
Subject: [PATCH] feat: Add version number in help and log
---
FofbTool/__init__.py | 2 +-
bin/FofbTool | 3 ++-
install_rcm.sh | 6 ++++++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/FofbTool/__init__.py b/FofbTool/__init__.py
index 8b13789..24c3af2 100644
--- a/FofbTool/__init__.py
+++ b/FofbTool/__init__.py
@@ -1 +1 @@
-
+__version__ = "AUTOVERSIONREPLACE"
diff --git a/bin/FofbTool b/bin/FofbTool
index b227e22..ddb4715 100755
--- a/bin/FofbTool
+++ b/bin/FofbTool
@@ -28,7 +28,7 @@ if __name__ == '__main__':
sh.setFormatter(logging.Formatter("{levelname:8}: {message}", style='{'))
logger.addHandler(sh)
- parser = argparse.ArgumentParser("FofbTool")
+ parser = argparse.ArgumentParser("FofbTool", description="version {}".format(FofbTool.__version__))
parser.add_argument("--log", default="info",
help="Log level (error, warning, info, debug)")
@@ -71,6 +71,7 @@ if __name__ == '__main__':
logger.setLevel(getattr(logging, args.log.upper()))
logger.debug(args)
+ logger.info("FofbTool version {}".format(FofbTool.__version__))
if not args.fileconfig is None:
FofbTool.Configuration.loadconfig(args.fileconfig)
diff --git a/install_rcm.sh b/install_rcm.sh
index 20c93d1..10fdc5f 100755
--- a/install_rcm.sh
+++ b/install_rcm.sh
@@ -2,6 +2,9 @@
echo "Deploy module and CLI in RCM environment"
+# Get the current version
+version=$(git describe --tags)
+
# Copy Python module
ipath=/home/operateur/.local/lib/python3.6/site-packages/FofbTool
mkdir -p $ipath
@@ -13,3 +16,6 @@ cp bin/FofbTool /home/production/scripts/DG/python/bin/ -vf
# Put exec rights
chmod +x /home/production/scripts/DG/python/bin/FofbTool
+
+# AWK the __init__.py file to replace the version variable
+awk -v version="$version" '{ gsub("AUTOVERSIONREPLACE",version) ; print}' FofbTool/__init__.py > $ipath/__init__.py
--
GitLab