format version of Non-Tagged Commit if from version.py

ccsb-scripps · Sep 6, 2024 · 776fe12 · 776fe12
1 parent c10579e
commit 776fe12
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.DS_Store b/.DS_Store
diff --git a/build/.DS_Store b/build/.DS_Store
diff --git a/build/python/setup.py b/build/python/setup.py
@@ -59,7 +59,13 @@ def find_version():
             version = f.read().strip()
 
         print('Version found: %s (from version.py)' % version)
-        return version
+
+        git_output = subprocess.check_output(['git', 'describe', '--abbrev=7', '--dirty=@mod', '--always', '--tags'])
+        git_output = git_output.strip().decode()
+
+        if git_output.startswith('v'):
+            git_output = git_output[1:]
+        return f"{git_output}+{version}"
 
     try:
         git_output = subprocess.check_output(['git', 'describe', '--abbrev=7', '--dirty=@mod', '--always', '--tags'])