diff --git a/Makefile b/Makefile index 0ab0993..6633d12 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ init: pip install -r req.txt test: + rm -f aprslib/*.pyc nosetests --verbosity 2 --with-coverage --cover-package=aprslib pylint: diff --git a/aprslib/IS.py b/aprslib/IS.py index 6ef0850..3d53339 100644 --- a/aprslib/IS.py +++ b/aprslib/IS.py @@ -24,7 +24,7 @@ import time import logging import sys -from .version import __version__ +from . import __version__ from .parse import parse from .exceptions import ( GenericError, diff --git a/aprslib/__init__.py b/aprslib/__init__.py index 101812b..d0a1637 100644 --- a/aprslib/__init__.py +++ b/aprslib/__init__.py @@ -27,10 +27,7 @@ from datetime import date as _date __date__ = str(_date.today()) del _date -from .version import __version__ as ref_version -__version__ = ref_version -del ref_version - +__version__ = "0.6.31" __author__ = "Rossen Georgiev" __all__ = ['IS', 'parse'] diff --git a/aprslib/version.py b/aprslib/version.py deleted file mode 100644 index 32d1c9e..0000000 --- a/aprslib/version.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = '0.6.31' diff --git a/setup.py b/setup.py index 0a2b397..4aad8e9 100644 --- a/setup.py +++ b/setup.py @@ -1,16 +1,18 @@ +#!/usr/bin/env python + from setuptools import setup from codecs import open from os import path -here = path.abspath(path.dirname(__file__)) -__version__ = open('aprslib/version.py').read().split("'")[1] +from aprslib import __version__ as lib_version +here = path.abspath(path.dirname(__file__)) with open(path.join(here, 'README.rst'), encoding='utf-8') as f: long_description = f.read() setup( name='aprslib', - version=__version__, + version=lib_version, description='Module for accessing APRS-IS and parsing APRS packets', long_description=long_description, url='https://github.com/rossengeorgiev/aprs-python',