Changes in / [24c207f:91fa88d]

Files:

• README.md (modified) (1 diff)
• python/lib/moresetuptools.py (modified) (1 diff)
• setup.py (modified) (2 diffs)
• src/wscript_build (modified) (1 diff)
• this_version.py (deleted)
• wscript (modified) (4 diffs)

README.md

@@ -1 +1 @@
 aubio library
 =============
-[![Travis build status](https://travis-ci.org/aubio/aubio.svg?branch=master)](https://travis-ci.org/aubio/aubio "Travis build status")
-[![Appveyor build status](https://ci.appveyor.com/api/projects/status/f3lhy3a57rkgn5yi?svg=true)](https://ci.appveyor.com/project/aubio/aubio/branch/master "Appveyor build status")
-[![Landscape code health](https://landscape.io/github/aubio/aubio/master/landscape.svg?style=flat)](https://landscape.io/github/aubio/aubio/master "Landscape code health")
-[![Documentation Status](https://readthedocs.org/projects/aubio/badge/?version=latest)](http://aubio.readthedocs.io/en/latest/?badge=latest "Documentation status")
-[![Commits since last release](https://img.shields.io/github/commits-since/aubio/aubio/0.4.4.svg?maxAge=2592000)](https://github.com/aubio/aubio "Commits since last release")
 
 aubio is a library to label music and sounds. It listens to audio signals and

python/lib/moresetuptools.py

@@ -5 +5 @@
 from .gen_external import generate_external, header, output_path
 
-from this_version import get_aubio_version
+def get_aubio_version():
+    # read from VERSION
+    this_file_dir = os.path.dirname(os.path.abspath(__file__))
+    version_file = os.path.join(this_file_dir, '..', '..', 'VERSION')
+
+    if not os.path.isfile(version_file):
+        raise SystemError("VERSION file not found.")
+
+    for l in open(version_file).readlines():
+        #exec (l.strip())
+        if l.startswith('AUBIO_MAJOR_VERSION'):
+            AUBIO_MAJOR_VERSION = int(l.split('=')[1])
+        if l.startswith('AUBIO_MINOR_VERSION'):
+            AUBIO_MINOR_VERSION = int(l.split('=')[1])
+        if l.startswith('AUBIO_PATCH_VERSION'):
+            AUBIO_PATCH_VERSION = int(l.split('=')[1])
+        if l.startswith('AUBIO_VERSION_STATUS'):
+            AUBIO_VERSION_STATUS = l.split('=')[1].strip()[1:-1]
+
+    if AUBIO_MAJOR_VERSION is None or AUBIO_MINOR_VERSION is None \
+            or AUBIO_PATCH_VERSION is None:
+        raise SystemError("Failed parsing VERSION file.")
+
+    verstr = '.'.join(map(str, [AUBIO_MAJOR_VERSION,
+                                     AUBIO_MINOR_VERSION,
+                                     AUBIO_PATCH_VERSION]))
+
+    if AUBIO_VERSION_STATUS is not None:
+        verstr += AUBIO_VERSION_STATUS
+    return verstr
+
+def get_aubio_pyversion():
+    # convert to version for python according to pep 440
+    # see https://www.python.org/dev/peps/pep-0440/
+    verstr = get_aubio_version()
+    if '~alpha' in verstr:
+        verstr = verstr.split('~')[0] + 'a1'
+    # TODO: add rc, .dev, and .post suffixes, add numbering
+    return verstr
 
 # inspired from https://gist.github.com/abergmeier/9488990

setup.py

@@ -6 +6 @@
 # function to generate gen/*.{c,h}
 from python.lib.gen_external import generate_external, header, output_path
-from this_version import get_aubio_version, get_aubio_pyversion
 
-__version__ = get_aubio_version()
-__pip_version__ = get_aubio_pyversion()
+__version__ = get_aubio_pyversion()
 
 include_dirs = []
@@ -57 +55 @@
 
 distrib = setup(name='aubio',
-    version = __pip_version__,
+    version = __version__,
     packages = ['aubio'],
     package_dir = {'aubio':'python/lib/aubio'},

src/wscript_build

@@ -48 +48 @@
 # install headers, except _priv.h ones
 ctx.install_files('${INCLUDEDIR}/aubio/',
-        ctx.path.ant_glob('**/*.h', excl = ['**_priv.h']),
+        ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),
         relative_trick=True)

wscript

@@ -15 +15 @@
 APPNAME = 'aubio'
 
-from this_version import *
-
-VERSION = get_aubio_version()
-LIB_VERSION = get_libaubio_version()
+# source VERSION
+for l in open('VERSION').readlines(): exec (l.strip())
+
+VERSION = '.'.join ([str(x) for x in [
+    AUBIO_MAJOR_VERSION,
+    AUBIO_MINOR_VERSION,
+    AUBIO_PATCH_VERSION
+    ]]) + AUBIO_VERSION_STATUS
+
+LIB_VERSION = '.'.join ([str(x) for x in [
+    LIBAUBIO_LT_CUR,
+    LIBAUBIO_LT_REV,
+    LIBAUBIO_LT_AGE]])
 
 top = '.'
@@ -123 +132 @@
     ctx.env['DEST_OS'] = target_platform
 
-    version_dict = get_version_info();
-    ctx.define('AUBIO_VERSION',VERSION)
-    ctx.define('AUBIO_MAJOR_VERSION', version_dict['AUBIO_MAJOR_VERSION'])
-    ctx.define('AUBIO_MINOR_VERSION', version_dict['AUBIO_MINOR_VERSION'])
-    ctx.define('AUBIO_PATCH_VERSION', version_dict['AUBIO_PATCH_VERSION'])
-    ctx.define('AUBIO_VERSION_STATUS', version_dict['AUBIO_VERSION_STATUS'])
-    
     if ctx.options.build_type == "debug":
         ctx.define('DEBUG', 1)
@@ -426 +428 @@
         if 'MANDIR' not in bld.env:
             bld.env['MANDIR'] = bld.env['DATAROOTDIR'] + '/man'
-        bld.env.VERSION = str(VERSION)
+        bld.env.VERSION = VERSION
         rule_str = '${TXT2MAN} -t `basename ${TGT} | cut -f 1 -d . | tr a-z A-Z`'
         rule_str += ' -r ${PACKAGE}\\ ${VERSION} -P ${PACKAGE}'
@@ -457 +459 @@
     # note: build in ../doc/_build/html, otherwise waf wont install unsigned files
     if bld.env['SPHINX']:
-        bld.env.VERSION = str(VERSION)
+        bld.env.VERSION = VERSION
         bld( name = 'sphinx',
                 rule = '${SPHINX} -b html -D release=${VERSION} -D version=${VERSION} -a -q `dirname ${SRC}` `dirname ${TGT}`',