setup.py: use 0.4.3a2

[aubio.git] / setup.py

diff --git a/setup.py b/setup.py
index e348937..7fc102c 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -8,9 +8,18 @@ from python.lib.gen_external import generate_external, header, output_path
 
 # read from 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
+
+if AUBIO_MAJOR_VERSION is None or AUBIO_MINOR_VERSION is None \
+        or AUBIO_PATCH_VERSION is None:
+    raise SystemError("Failed parsing VERSION file.")
+
+__version__ = '.'.join(map(str, [AUBIO_MAJOR_VERSION,
+                                 AUBIO_MINOR_VERSION,
+                                 AUBIO_PATCH_VERSION]))
+if AUBIO_VERSION_STATUS is not None:
+    if AUBIO_VERSION_STATUS.startswith('~'):
+        AUBIO_VERSION_STATUS = AUBIO_VERSION_STATUS[1:]
+    __version__ += AUBIO_VERSION_STATUS
 
 include_dirs = []
 library_dirs = []
@@ -47,7 +56,7 @@ if os.path.isfile('src/aubio.h'):
     else:
         # add libaubio sources and look for optional deps with pkg-config
         add_local_aubio_sources(aubio_extension)
-        __version__ += '_libaubio'
+        __version__ += 'a2' # pypi version
 else:
     # look for aubio headers and lib using pkg-config
     add_system_aubio(aubio_extension)
@@ -82,8 +91,8 @@ distrib = setup(name='aubio',
     package_dir = {'aubio':'python/lib/aubio'},
     scripts = ['python/scripts/aubiocut'],
     ext_modules = [aubio_extension],
-    description = 'interface to the aubio library',
-    long_description = 'interface to the aubio library',
+    description = 'a collection of tools for music analysis',
+    long_description = 'a collection of tools for music analysis',
     license = 'GNU/GPL version 3',
     author = 'Paul Brossier',
     author_email = 'piem@aubio.org',