Single-sourcing the version string

This commit is contained in:
2019-10-29 17:33:29 +01:00
parent bacc05cb41
commit e9ba1882bc
5 changed files with 20 additions and 2 deletions

View File

@@ -16,10 +16,12 @@ __all__ = [
"QuarantineMilter", "QuarantineMilter",
"generate_milter_config", "generate_milter_config",
"reload_config", "reload_config",
"cli",
"mailer", "mailer",
"notifications", "notifications",
"run",
"quarantines", "quarantines",
"run",
"version",
"whitelists"] "whitelists"]
name = "pyquarantine" name = "pyquarantine"

View File

@@ -22,6 +22,7 @@ import time
import pyquarantine import pyquarantine
from pyquarantine.version import __version__ as version
def _get_quarantine_obj(config, quarantine): def _get_quarantine_obj(config, quarantine):
try: try:
@@ -302,6 +303,11 @@ def main():
"-d", "--debug", "-d", "--debug",
help="Log debugging messages.", help="Log debugging messages.",
action="store_true") action="store_true")
parser.add_argument(
"-v", "--version",
help="Print version.",
action="version",
version="%(prog)s ({})".format(version))
parser.set_defaults(syslog=False) parser.set_defaults(syslog=False)
subparsers = parser.add_subparsers( subparsers = parser.add_subparsers(
dest="command", dest="command",

View File

@@ -22,6 +22,7 @@ import sys
import pyquarantine import pyquarantine
from pyquarantine.version import __version__ as version
def main(): def main():
"Run PyQuarantine-Milter." "Run PyQuarantine-Milter."
@@ -47,6 +48,11 @@ def main():
"-t", "--test", "-t", "--test",
help="Check configuration.", help="Check configuration.",
action="store_true") action="store_true")
parser.add_argument(
"-v", "--version",
help="Print version.",
action="version",
version="%(prog)s ({})".format(version))
args = parser.parse_args() args = parser.parse_args()
# setup logging # setup logging

1
pyquarantine/version.py Normal file
View File

@@ -0,0 +1 @@
__version__ = "0.0.2"

View File

@@ -4,8 +4,11 @@ def read_file(fname):
with open(fname, 'r') as f: with open(fname, 'r') as f:
return f.read() return f.read()
version = {}
exec(read_file("pyquarantine/version.py"), version)
setup(name = "pyquarantine", setup(name = "pyquarantine",
version = "0.0.2", version = version["__version__"],
author = "Thomas Oettli", author = "Thomas Oettli",
author_email = "spacefreak@noop.ch", author_email = "spacefreak@noop.ch",
description = "A pymilter based sendmail/postfix pre-queue filter.", description = "A pymilter based sendmail/postfix pre-queue filter.",