From: Paul Brossier <piem@piem.org>
Date: Sun, 15 May 2016 23:55:14 +0000 (+0200)
Subject: setup.py: clean up, remove ~
X-Git-Tag: 0.4.4~300^2~21
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=416ddd1268856448ec2b79b189b8c0f9d6347974;p=aubio.git

setup.py: clean up, remove ~
---

diff --git a/setup.py b/setup.py
index e3489371..8c9552bc 100755
--- 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 = []