Merge "Stop setting version manually"

oslogmerger/oslogmerger.py

@@ -13,8 +13,9 @@ import time
 import dateutil.parser
 import dateutil.tz
 from six.moves.urllib.request import urlopen
+import pbr.version
 
-__version__ = '1.1.1'
+__version__ = pbr.version.VersionInfo('os-log-merger').version_string()
 
 EXTRALINES_PADDING = " " * 40
 CACHE_DIR = "%s/oslogmerger-cache/" % tempfile.gettempdir()

requirements.txt

@@ -1,2 +1,3 @@
+pbr
 python-dateutil
 six

setup.py

@@ -1,8 +1,6 @@
 from setuptools import setup
-from oslogmerger.oslogmerger import __version__
 
 setup(
-    version=__version__,
     setup_requires=['pbr>=2.0.0'],
     pbr=True,
 )