Merge branch 'master' into develop

pwman3 · Jun 17, 2015 · f4418c5 · f4418c5
2 parents 310b769 + c948d1c
commit f4418c5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pwman/__init__.py b/pwman/__init__.py
@@ -23,11 +23,16 @@
 import sys
 import re
 import colorama
+import pkg_resources
 from pwman.util import config
 from pwman.data.factory import check_db_version
 
 appname = "pwman3"
-version = "0.7"
+
+try:
+    version = pkg_resources.get_distribution('pwman3').version
+except pkg_resources.DistributionNotFound:  # pragma: no cover
+    version = "0.7.1"
 
 website = "http://pwman3.github.io/pwman3/"
 author = "Oz Nahum Tiram"