Changeset 1eb8c0e for python

Timestamp:

Mar 13, 2017, 5:10:55 PM (8 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:

8259e09

Parents:

67b6618

Message:

aubio version :
aubio-c / aubio-py add git commit support

File:

• python/lib/moresetuptools.py (modified) (2 diffs)

python/lib/moresetuptools.py

@@ -32 +32 @@
                                      AUBIO_PATCH_VERSION]))
 
-    if AUBIO_VERSION_STATUS is not None:
+    AUBIO_GIT_SHA = get_git_revision_hash()
+    """ append sha to version in alpha release
+    """
+    if '~alpha' in AUBIO_VERSION_STATUS :
+        if AUBIO_GIT_SHA:
+            AUBIO_VERSION_STATUS = '~git'+AUBIO_GIT_SHA
+    if AUBIO_VERSION_STATUS is not None :
         verstr += AUBIO_VERSION_STATUS
     return verstr
@@ -40 +46 @@
     # see https://www.python.org/dev/peps/pep-0440/
     verstr = get_aubio_version()
-    if '~alpha' in verstr:
-        verstr = verstr.split('~')[0] + 'a1'
+    if '~alpha' in verstr or '~git' in verstr:
+        verstr = verstr.split('~')[0] + '+a1'
+        gitsha = get_git_revision_hash(short=True)
+        if gitsha:
+            verstr+='.git.'+gitsha
     # TODO: add rc, .dev, and .post suffixes, add numbering
     return verstr
+
+
+
+def get_git_revision_hash( short=True):
+    def which(program):
+    
+        def is_exe(fpath):
+            return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
+
+        fpath, fname = os.path.split(program)
+        if fpath:
+            if is_exe(program):
+                return program
+        else:
+            for path in os.environ["PATH"].split(os.pathsep):
+                path = path.strip('"')
+                exe_file = os.path.join(path, program)
+                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'
+        return ""
+
+    import subprocess
+    this_file_dir = os.path.dirname(os.path.abspath(__file__))
+    aubio_dir = os.path.join(this_file_dir, '..', '..')
+    aubio_dir = os.path.abspath(aubio_dir)
+    if not os.path.exists(aubio_dir):
+        raise SystemError("git / root folder not found")
+    gitcmd = ['git','-C',aubio_dir ,'rev-parse']
+    if short:
+      gitcmd.append('--short')
+    gitcmd.append('HEAD')
+    return subprocess.check_output(gitcmd).strip()
 
 # inspired from https://gist.github.com/abergmeier/9488990