summaryrefslogtreecommitdiff
path: root/trove/version.py
diff options
context:
space:
mode:
authorCraig Vyvial <cp16net@gmail.com>2015-11-04 17:15:07 -0600
committerCraig Vyvial <cp16net@gmail.com>2015-11-05 11:04:46 -0600
commit68c1c61b5492ede70cc4187c48fb7b7525185653 (patch)
tree65a109d30209e5b58071684d02c50470969e87b2 /trove/version.py
parentb6459ac348a1065e5d685accd24b46a02a06325f (diff)
downloadtrove-68c1c61b5492ede70cc4187c48fb7b7525185653.tar.gz
fix the version info of trove to use pbr
Change-Id: I2a445cdea20e70399e331ea4e97042ecd0137c2e Closes-Bug: #1513259
Diffstat (limited to 'trove/version.py')
-rw-r--r--trove/version.py31
1 files changed, 2 insertions, 29 deletions
diff --git a/trove/version.py b/trove/version.py
index 33656d8f..92324a15 100644
--- a/trove/version.py
+++ b/trove/version.py
@@ -13,33 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-try:
- from trove.vcsversion import version_info
-except ImportError:
- version_info = {'branch_nick': u'LOCALBRANCH',
- 'revision_id': 'LOCALREVISION',
- 'revno': 0}
+import pbr.version
-TROVE_VERSION = ['2012', '1']
-YEAR, COUNT = TROVE_VERSION
-
-FINAL = False # This becomes true at Release Candidate time
-
-
-def canonical_version_string():
- return '.'.join([YEAR, COUNT])
-
-
-def version_string():
- if FINAL:
- return canonical_version_string()
- else:
- return '%s-dev' % (canonical_version_string(),)
-
-
-def vcs_version_string():
- return "%s:%s" % (version_info['branch_nick'], version_info['revision_id'])
-
-
-def version_string_with_vcs():
- return "%s-%s" % (canonical_version_string(), vcs_version_string())
+version_info = pbr.version.VersionInfo('trove')