From 3d8c960e05edd46e27e727bd6eb4dfba2ac51f99 Mon Sep 17 00:00:00 2001 From: Thomas Oettli Date: Thu, 12 Nov 2020 12:01:31 +0100 Subject: [PATCH] change version to 1.1.0 --- pymodmilter/__init__.py | 3 ++- pymodmilter/run.py | 2 +- pymodmilter/version.py | 1 - setup.cfg | 2 ++ setup.py | 3 --- 5 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 pymodmilter/version.py create mode 100644 setup.cfg diff --git a/pymodmilter/__init__.py b/pymodmilter/__init__.py index f5e038e..4a19a3f 100644 --- a/pymodmilter/__init__.py +++ b/pymodmilter/__init__.py @@ -16,11 +16,12 @@ __all__ = [ "actions", "conditions", "run", - "version", "CustomLogger", "Rule", "ModifyMilter"] +__version__ = "1.1.0" + import Milter import logging diff --git a/pymodmilter/run.py b/pymodmilter/run.py index cd4aedb..6895630 100644 --- a/pymodmilter/run.py +++ b/pymodmilter/run.py @@ -22,7 +22,7 @@ from json import loads from re import sub from pymodmilter import Rule, ModifyMilter -from pymodmilter.version import __version__ as version +from pymodmilter import __version__ as version from pymodmilter.actions import Action diff --git a/pymodmilter/version.py b/pymodmilter/version.py deleted file mode 100644 index 9fd0f8d..0000000 --- a/pymodmilter/version.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = "1.0.10" diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..f3d2f8a --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[metadata] +version = attr: pymodmilter.__version__ diff --git a/setup.py b/setup.py index c158fd6..7dde3be 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("pymodmilter/version.py"), version) setup(name = "pymodmilter", - version = version["__version__"], author = "Thomas Oettli", author_email = "spacefreak@noop.ch", description = "A pymilter based sendmail/postfix pre-queue filter.",