From 44d81d873e15195cd9c562ecee634ea2cbd82c22 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 5 Jul 2018 16:54:12 -0500 Subject: [PATCH] Stop setting version manually One of the reasons that pbr exists is to have versions be driven by signed git tags instead of by content in the source repository. This has the benefit of being both easier and preventing people from forgetting to push a git tag when they cut a release. Additionally, this code is doesn't work for sdist jobs in Zuul upstream because it requires the project to be importable to run setup.py, but sdist/wheel generation does not otherwise need to install dependencies. Remove the override of version in setup.py and replace the hard-coded version string in oslogmerger.py with the appropriate pbr code. Change-Id: Ifdbb649b02d7e2fde6e8682e138c81817543fb08 --- oslogmerger/oslogmerger.py | 3 ++- requirements.txt | 1 + setup.py | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oslogmerger/oslogmerger.py b/oslogmerger/oslogmerger.py index 1344e62..c27f1ac 100644 --- a/oslogmerger/oslogmerger.py +++ b/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() diff --git a/requirements.txt b/requirements.txt index d87e947..7706efa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ +pbr python-dateutil six diff --git a/setup.py b/setup.py index 9c697b9..808738c 100644 --- a/setup.py +++ b/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, )