Changes in / [cc4987a:6448d31]

Files:

• .gitignore (modified) (1 diff)
• MANIFEST.in (modified) (1 diff)
• README.md (modified) (1 diff)
• doc/conf.py (modified) (2 diffs)
• python/lib/moresetuptools.py (modified) (2 diffs)
• setup.py (modified) (1 diff)
• this_version.py (deleted)
• wscript (modified) (1 diff)

.gitignore

@@ -39 +39 @@
 python/*.wav
 
-pip-delete-this-directory.txt
-
 aubio-*.tar.bz2
 aubio-*.zip
-dist/*.tar.gz
 
 # test sounds

MANIFEST.in

@@ -1 +1 @@
 include AUTHORS COPYING README.md VERSION ChangeLog
 include python/README.md
-include this_version.py
 include Makefile wscript */wscript_build
 include waf waflib/* waflib/*/*

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

doc/conf.py

@@ -13 +13 @@
 
 import sys, os
-
-# get version using this_version.py
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..'))
-from this_version import get_aubio_version
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -53 +49 @@
 #
 # The short X.Y version.
-
-version = get_aubio_version()[:3]
+version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = get_aubio_version()
+release = '0.4.5~alpha'
 
 # The language for content autogenerated by Sphinx. Refer to documentation

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
@@ -178 +216 @@
                 add_local_aubio_sources(extension)
         # generate files python/gen/*.c, python/gen/aubio-generated.h
-        extension.include_dirs += [ output_path ]
         extension.sources += generate_external(header, output_path, overwrite = False,
                 usedouble=enable_double)

setup.py

@@ -3 +3 @@
 import sys, os.path, glob
 from setuptools import setup, Extension
-from python.lib.moresetuptools import build_ext, CleanGenerated
+from python.lib.moresetuptools import *
 # function to generate gen/*.{c,h}
-from this_version import get_aubio_version, get_aubio_pyversion
+from python.lib.gen_external import generate_external, header, output_path
 
 __version__ = get_aubio_pyversion()
-__aubio_version__ = get_aubio_version()
 
 include_dirs = []
 library_dirs = []
-define_macros = [('AUBIO_VERSION', '%s' % __aubio_version__)]
+define_macros = [('AUBIO_VERSION', '%s' % __version__)]
 extra_link_args = []
 
 include_dirs += [ 'python/ext' ]
+include_dirs += [ output_path ] # aubio-generated.h
 try:
     import numpy

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 = '.'