Update to latest oslo version code.

Removes the need for the versioninfo file, as now everything can be done via
pkg_resources.

Change-Id: Ice2ea2f99f5aacbd476075d12077b7287d824585

1 files changed, 9 insertions, 20 deletions

diff --git a/cinderclient/__init__.py b/cinderclient/__init__.py
index 1f8ab19..6f6043c 100644
--- a/cinderclient/__init__.py
+++ b/cinderclient/__init__.py
@@ -14,23 +14,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
-import inspect
-
-
-def _get_client_version():
-    """Read version from versioninfo file."""
-    mod_abspath = inspect.getabsfile(inspect.currentframe())
-    client_path = os.path.dirname(mod_abspath)
-    version_path = os.path.join(client_path, 'versioninfo')
-
-    if os.path.exists(version_path):
-        version = open(version_path).read().strip()
-    else:
-        version = "Unknown, couldn't find versioninfo file at %s"\
-                  % version_path
-
-    return version
-
-
-__version__ = _get_client_version()
+from cinderclient.openstack.common import version
+
+version_info = version.VersionInfo('python-cinderclient')
+# We have a circular import problem when we first run python setup.py sdist
+# It's harmless, so deflect it.
+try:
+    __version__ = version_info.version_string()
+except AttributeError:
+    __version__ = None