From af874890221b145a8cb423d3c1fc5dc133dbef13 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Fri, 2 Aug 2013 11:57:17 -0500 Subject: [PATCH] Change version reporting to use pbr Gets rid of the hard-coded version string in shell.py Change-Id: I8b818c9a8f1224669079141e7a7caf614e588d20 --- openstackclient/__init__.py | 12 ++++++++++-- openstackclient/shell.py | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/openstackclient/__init__.py b/openstackclient/__init__.py index 85ac2501b8..89deee32ea 100644 --- a/openstackclient/__init__.py +++ b/openstackclient/__init__.py @@ -1,5 +1,3 @@ -# Copyright 2012-2013 OpenStack, LLC. -# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at @@ -12,3 +10,13 @@ # License for the specific language governing permissions and limitations # under the License. # + +__all__ = ['__version__'] + +import pbr.version + +version_info = pbr.version.VersionInfo('python-openstackclient') +try: + __version__ = version_info.version_string() +except AttributeError: + __version__ = None diff --git a/openstackclient/shell.py b/openstackclient/shell.py index 8a15bc9bae..b66611b163 100644 --- a/openstackclient/shell.py +++ b/openstackclient/shell.py @@ -24,6 +24,7 @@ import sys from cliff import app from cliff import help +import openstackclient from openstackclient.common import clientmanager from openstackclient.common import commandmanager from openstackclient.common import exceptions as exc @@ -31,7 +32,6 @@ from openstackclient.common import openstackkeyring from openstackclient.common import utils -VERSION = '0.2.rc1' KEYRING_SERVICE = 'openstack' DEFAULT_COMPUTE_API_VERSION = '2' @@ -64,7 +64,7 @@ class OpenStackShell(app.App): def __init__(self): super(OpenStackShell, self).__init__( description=__doc__.strip(), - version=VERSION, + version=openstackclient.__version__, command_manager=commandmanager.CommandManager('openstack.cli')) # This is instantiated in initialize_app() only when using