Changeset 79ef3b3

Timestamp:

Mar 13, 2017, 5:48:53 PM (7 years ago)

Author:

Martin Hermant <martin.hermant@gmail.com>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, sampler

Children:

aab682e

Parents:

dd3b1d5

Message:

hide AUBIO_GIT_SHA in release
fix py3 syntax error

Files:

• python/lib/moresetuptools.py (modified) (1 diff)
• wscript (modified) (3 diffs)

python/lib/moresetuptools.py

@@ -32 +32 @@
                                      AUBIO_PATCH_VERSION]))
 
-    AUBIO_GIT_SHA = get_git_revision_hash()
+    
     # append sha to version in alpha release
     # MAJ.MIN.PATCH.{~git<sha> , ''}
     if '~alpha' in AUBIO_VERSION_STATUS :
+        AUBIO_GIT_SHA = get_git_revision_hash()
         if AUBIO_GIT_SHA:
             AUBIO_VERSION_STATUS = '~git'+AUBIO_GIT_SHA
+
     if AUBIO_VERSION_STATUS is not None :
         verstr += AUBIO_VERSION_STATUS

wscript

@@ -34 +34 @@
                 if is_exe(exe_file):
                     return exe_file
-
         return None
-        
+
     if not which('git'):
         print('no git found on this system : can\'t get sha')
@@ -49 +48 @@
       gitcmd.append('--short')
     gitcmd.append('HEAD')
-    return subprocess.check_output(gitcmd).strip()
-
-AUBIO_GIT_SHA = get_git_revision_hash()
-""" append sha to version in alpha release
-"""
-if '~alpha' in AUBIO_VERSION_STATUS :
+    return str(subprocess.check_output(gitcmd).strip())
+
+
+# append sha to version in alpha release
+if AUBIO_VERSION_STATUS and '~alpha' in AUBIO_VERSION_STATUS :
+    AUBIO_GIT_SHA = get_git_revision_hash()
     if AUBIO_GIT_SHA:
         AUBIO_VERSION_STATUS = '~git'+AUBIO_GIT_SHA
@@ -180 +179 @@
     ctx.define('AUBIO_PATCH_VERSION',AUBIO_PATCH_VERSION)
     ctx.define('AUBIO_VERSION_STATUS',AUBIO_VERSION_STATUS)
-    ctx.define('AUBIO_GIT_SHA',AUBIO_GIT_SHA)
+    # ctx.define('AUBIO_GIT_SHA',AUBIO_GIT_SHA)
     if ctx.options.build_type == "debug":
         ctx.define('DEBUG', 1)