diff --git a/.bumpversion.cfg b/.bumpversion.cfg new file mode 100644 index 0000000..c10d9ae --- /dev/null +++ b/.bumpversion.cfg @@ -0,0 +1,7 @@ +[bumpversion] +commit = True +tag = True +current_version = 1.13.0 + +[bumpversion:file:setup.py] + diff --git a/amodem/__main__.py b/amodem/__main__.py index caee8f0..761f088 100644 --- a/amodem/__main__.py +++ b/amodem/__main__.py @@ -6,11 +6,12 @@ import os import sys import zlib +import pkg_resources + from . import async from . import audio from . import calib from . import main -from . import version from .config import bitrates @@ -193,11 +194,15 @@ class _Dummy(object): pass +def _version(): + return pkg_resources.require('amodem')[0].version + + def _main(): fmt = ('Audio OFDM MODEM v{0:s}: ' '{1:.1f} kb/s ({2:d}-QAM x {3:d} carriers) ' 'Fs={4:.1f} kHz') - description = fmt.format(version.__doc__, + description = fmt.format(_version(), config.modem_bps / 1e3, len(config.symbols), config.Nfreq, config.Fs / 1e3) interface = None diff --git a/amodem/version.py b/amodem/version.py deleted file mode 100644 index 4eecd80..0000000 --- a/amodem/version.py +++ /dev/null @@ -1 +0,0 @@ -'1.13' diff --git a/setup.py b/setup.py index 7eaae28..50f0d8d 100644 --- a/setup.py +++ b/setup.py @@ -2,17 +2,6 @@ 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): def finalize_options(self): @@ -26,7 +15,7 @@ class PyTest(TestCommand): setup( name='amodem', - version=parse_vesrion(), + version='1.13.0', description='Audio Modem Communication Library', author='Roman Zeyde', author_email='roman.zeyde@gmail.com',