diff --git a/pyquarantine/__init__.py b/pyquarantine/__init__.py index 811dcf3..8fa8d2f 100644 --- a/pyquarantine/__init__.py +++ b/pyquarantine/__init__.py @@ -41,9 +41,10 @@ __all__ = [ "notifications", "storages", "run", - "version", "whitelists"] +__version__ = "1.0.6" + def make_header(decoded_seq, maxlinelen=None, header_name=None, continuation_ws=' ', errors='strict'): diff --git a/pyquarantine/cli.py b/pyquarantine/cli.py index cdf901d..14d9828 100644 --- a/pyquarantine/cli.py +++ b/pyquarantine/cli.py @@ -21,7 +21,7 @@ import sys import time from pyquarantine import QuarantineMilter, setup_milter -from pyquarantine.version import __version__ as version +from pyquarantine import __version__ as version def _get_quarantine(quarantines, name): diff --git a/pyquarantine/run.py b/pyquarantine/run.py index d9b507b..45e8edf 100644 --- a/pyquarantine/run.py +++ b/pyquarantine/run.py @@ -22,7 +22,7 @@ import sys import pyquarantine -from pyquarantine.version import __version__ as version +from pyquarantine import __version__ as version def main(): diff --git a/pyquarantine/version.py b/pyquarantine/version.py deleted file mode 100644 index 68cdeee..0000000 --- a/pyquarantine/version.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = "1.0.5" diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..90d059a --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[metadata] +version = attr: pyquarantine.__version__ diff --git a/setup.py b/setup.py index cc68828..dbd1eee 100644 --- a/setup.py +++ b/setup.py @@ -4,11 +4,8 @@ def read_file(fname): with open(fname, 'r') as f: return f.read() -version = {} -exec(read_file("pyquarantine/version.py"), version) setup(name = "pyquarantine", - version = version["__version__"], author = "Thomas Oettli", author_email = "spacefreak@noop.ch", description = "A pymilter based sendmail/postfix pre-queue filter.",