From 20b3e3ddd3d2824622b1be4602b0260a1063ab9f Mon Sep 17 00:00:00 2001
From: Thomas Oettli <spacefreak@noop.ch>
Date: Tue, 29 Oct 2019 17:33:29 +0100
Subject: [PATCH] Single-sourcing the version string

---
 pyquarantine/__init__.py | 4 +++-
 pyquarantine/cli.py      | 6 ++++++
 pyquarantine/run.py      | 6 ++++++
 pyquarantine/version.py  | 1 +
 setup.py                 | 5 ++++-
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 pyquarantine/version.py

diff --git a/pyquarantine/__init__.py b/pyquarantine/__init__.py
index 4a7ca72..08305fc 100644
--- a/pyquarantine/__init__.py
+++ b/pyquarantine/__init__.py
@@ -16,10 +16,12 @@ __all__ = [
     "QuarantineMilter",
     "generate_milter_config",
     "reload_config",
+    "cli",
     "mailer",
     "notifications",
-    "run",
     "quarantines",
+    "run",
+    "version",
     "whitelists"]
 
 name = "pyquarantine"
diff --git a/pyquarantine/cli.py b/pyquarantine/cli.py
index f3592f7..8e16c56 100644
--- a/pyquarantine/cli.py
+++ b/pyquarantine/cli.py
@@ -22,6 +22,7 @@ import time
 
 import pyquarantine
 
+from pyquarantine.version import __version__ as version
 
 def _get_quarantine_obj(config, quarantine):
     try:
@@ -302,6 +303,11 @@ def main():
         "-d", "--debug",
         help="Log debugging messages.",
         action="store_true")
+    parser.add_argument(
+        "-v", "--version",
+        help="Print version.",
+        action="version",
+        version="%(prog)s ({})".format(version))
     parser.set_defaults(syslog=False)
     subparsers = parser.add_subparsers(
         dest="command",
diff --git a/pyquarantine/run.py b/pyquarantine/run.py
index d52dcd4..a38a064 100644
--- a/pyquarantine/run.py
+++ b/pyquarantine/run.py
@@ -22,6 +22,7 @@ import sys
 
 import pyquarantine
 
+from pyquarantine.version import __version__ as version
 
 def main():
     "Run PyQuarantine-Milter."
@@ -47,6 +48,11 @@ def main():
         "-t", "--test",
         help="Check configuration.",
         action="store_true")
+    parser.add_argument(
+        "-v", "--version",
+        help="Print version.",
+        action="version",
+        version="%(prog)s ({})".format(version))
     args = parser.parse_args()
 
     # setup logging
diff --git a/pyquarantine/version.py b/pyquarantine/version.py
new file mode 100644
index 0000000..3b93d0b
--- /dev/null
+++ b/pyquarantine/version.py
@@ -0,0 +1 @@
+__version__ = "0.0.2"
diff --git a/setup.py b/setup.py
index b51d2d9..39fe2de 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,11 @@ 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 = "0.0.2",
+    version = version["__version__"],
     author = "Thomas Oettli",
     author_email = "spacefreak@noop.ch",
     description = "A pymilter based sendmail/postfix pre-queue filter.",