From 416ddd1268856448ec2b79b189b8c0f9d6347974 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Mon, 16 May 2016 01:55:14 +0200 Subject: [PATCH] setup.py: clean up, remove ~ --- setup.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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 = [] -- 2.11.0