Changeset 87a4a5a

Timestamp:

Mar 23, 2017, 6:03:22 PM (8 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:

bef7726

Parents:

7b9b6ba

Message:

this_version.py: build a valid pep440 version string

File:

• this_version.py (modified) (1 diff)

this_version.py

@@ -77 +77 @@
     # convert to version for python according to pep 440
     # see https://www.python.org/dev/peps/pep-0440/
-    # outputs MAJ.MIN.PATCH+a0{.git<sha> , ''}
+    # outputs MAJ.MIN.PATCH[a0[+git.<sha>[.mods]]]
     vdict = get_version_info()
     verstr = '%s.%s.%s' % get_aubio_version_tuple()
     if add_status and vdict['AUBIO_VERSION_STATUS']:
-        if '~git' in vdict['AUBIO_VERSION_STATUS']:
-            verstr += "+a0." + vdict['AUBIO_VERSION_STATUS'][1:]
+        if vdict['AUBIO_VERSION_STATUS'].startswith('~git+'):
+            pep440str = vdict['AUBIO_VERSION_STATUS'].replace('+', '.')
+            verstr += pep440str.replace('~git.', 'a0+')
         elif '~alpha' in vdict['AUBIO_VERSION_STATUS']:
-            verstr += "+a0"
+            verstr += "a0"
         else:
             raise SystemError("Aubio version statut not supported : %s" %