Changeset c6c20be

Timestamp:

Mar 23, 2017, 3:44:49 PM (7 years ago)

Author:

Paul Brossier <piem@piem.org>

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:

69de807

Parents:

07bfe2d2

git-author:

Martin Hermant <martin.hermant@gmail.com> (03/16/17 18:47:26)

git-committer:

Paul Brossier <piem@piem.org> (03/23/17 15:44:49)

Message:

this_version.py : * fix : get_aubio_version : remove ‘.’ before ~git * fix typo : check ~alpha in version status

File:

• this_version.py (modified) (2 diffs)

this_version.py

@@ -67 +67 @@
 
 def get_aubio_version(add_status=True):
-    # return string formatted as MAJ.MIN.PATCH.{~git<sha> , ''}
+    # return string formatted as MAJ.MIN.PATCH{~git<sha> , ''}
     vdict = get_version_info()
     verstr = '%s.%s.%s' % get_aubio_version_tuple()
     if add_status and vdict['AUBIO_VERSION_STATUS']:
-        verstr += "." + vdict['AUBIO_VERSION_STATUS']
+        verstr += vdict['AUBIO_VERSION_STATUS']
     return verstr
 
@@ -84 +84 @@
         if '~git' in vdict['AUBIO_VERSION_STATUS']:
             verstr += "+a0." + vdict['AUBIO_VERSION_STATUS'][1:]
-        elif '~alpha':
+        elif '~alpha' in vdict['AUBIO_VERSION_STATUS']:
             verstr += "+a0"
         else: