From c56f696e9eacd82cbcefa5c50325a0b1362904b8 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Tue, 23 Jun 2015 11:37:43 +0300 Subject: [PATCH] version: use separate file for versioning --- amodem/__main__.py | 7 +++++-- amodem/version.py | 1 + setup.py | 12 +++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 amodem/version.py diff --git a/amodem/__main__.py b/amodem/__main__.py index 41cef5b..af36a7a 100644 --- a/amodem/__main__.py +++ b/amodem/__main__.py @@ -2,6 +2,7 @@ # PYTHON_ARGCOMPLETE_OK from amodem import main, calib, audio, async from amodem.config import bitrates +from . import version import os import sys @@ -185,9 +186,11 @@ def create_parser(description, interface): def _main(): - fmt = ('Audio OFDM MODEM: {0:.1f} kb/s ({1:d}-QAM x {2:d} carriers) ' + fmt = ('Audio OFDM MODEM v{0:s}: ' + '{1:.1f} kb/s ({2:d}-QAM x {3:d} carriers) ' 'Fs={3:.1f} kHz') - description = fmt.format(config.modem_bps / 1e3, len(config.symbols), + description = fmt.format(version.__doc__, + config.modem_bps / 1e3, len(config.symbols), config.Nfreq, config.Fs / 1e3) interface = audio.Interface(config=config) p = create_parser(description, interface) diff --git a/amodem/version.py b/amodem/version.py new file mode 100644 index 0000000..bb668fd --- /dev/null +++ b/amodem/version.py @@ -0,0 +1 @@ +'1.11' diff --git a/setup.py b/setup.py index ed8799a..92a33e5 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,16 @@ from setuptools import setup from setuptools.command.test import test as TestCommand +import os +import ast + +def parse_vesrion(): + cwd = os.path.dirname(__name__) + version_file = os.path.join(cwd, 'amodem', 'version.py') + + tree = ast.parse(open(version_file).read()) + expr, = tree.body + return expr.value.s class PyTest(TestCommand): @@ -16,7 +26,7 @@ class PyTest(TestCommand): setup( name='amodem', - version='1.11', + version=parse_vesrion(), description='Audio Modem Communication Library', author='Roman Zeyde', author_email='roman.zeyde@gmail.com',