Browse Source

Merge "Stop setting version manually"

Zuul 6 months ago
parent
commit
546fee53dc
3 changed files with 3 additions and 3 deletions
  1. 2
    1
      oslogmerger/oslogmerger.py
  2. 1
    0
      requirements.txt
  3. 0
    2
      setup.py

+ 2
- 1
oslogmerger/oslogmerger.py View File

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

+ 1
- 0
requirements.txt View File

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

+ 0
- 2
setup.py View File

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

Loading…
Cancel
Save