Fix strange usage of pycbc.version.release

gwastro · Feb 6, 2025 · cca7c04 · cca7c04
1 parent f38df69
commit cca7c04
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pycbc/results/versioning.py b/pycbc/results/versioning.py
@@ -92,9 +92,11 @@ def add_info_new_version(info_dct, curr_module, extra_str):
 
     pycbcinfo = {}
     pycbcinfo['Name'] = 'PyCBC'
-    pycbcinfo['ID'] = pycbc.version.version
+    pycbcinfo['ID'] = pycbc.version.git_hash
     pycbcinfo['Status'] = pycbc.version.git_status
-    pycbcinfo['Version'] = pycbc.version.release or ''
+    pycbcinfo['Version'] = pycbc.version.version
+    if pycbc.version.release:
+        pycbcinfo['Version'] += ' (release)'
     pycbcinfo['Tag'] = pycbc.version.git_tag
     pycbcinfo['Author'] = pycbc.version.git_author
     pycbcinfo['Builder'] = pycbc.version.git_builder

diff --git a/setup.py b/setup.py
@@ -96,15 +96,15 @@ def __getattr__(self, attr):
     except:
         vinfo = vdummy()
         vinfo.version = '2.8.dev0'
-        vinfo.release = 'False'
+        vinfo.release = False
 
     version_script = f"""# coding: utf-8
 # Generated by setup.py for PyCBC on {vinfo.build_date}.
 
 # general info
 version = '{vinfo.version}'
 date = '{vinfo.date}'
-release = '{vinfo.release}'
+release = {vinfo.release}
 last_release = '{vinfo.last_release}'
 
 # git info