From 2f05a3d0667efa07004c71e13217f1ed6d95b198 Mon Sep 17 00:00:00 2001 From: tengqm Date: Fri, 3 Jun 2016 03:13:15 -0400 Subject: [PATCH] Move version definition Having openstack/__init__.py referencing pbr is causing some problems sometimes when invoking sdk apis. This patch propose moving the version definition into a module under openstack/. Close-Bug: 1588823 Change-Id: I587de91ea7f523bb923ed9ac665a0b46d40d722c --- openstack/__init__.py | 18 ------------------ openstack/session.py | 4 ++-- openstack/version.py | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 20 deletions(-) create mode 100644 openstack/version.py diff --git a/openstack/__init__.py b/openstack/__init__.py index b5e656422..e69de29bb 100644 --- a/openstack/__init__.py +++ b/openstack/__init__.py @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- - -# 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 -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import pbr.version - - -__version__ = pbr.version.VersionInfo('openstacksdk').version_string() diff --git a/openstack/session.py b/openstack/session.py index 9dc18389d..c3cb3c7bc 100644 --- a/openstack/session.py +++ b/openstack/session.py @@ -21,12 +21,12 @@ import re from keystoneauth1 import exceptions as _exceptions from keystoneauth1 import session as _session -import openstack from openstack import exceptions +from openstack import version as openstack_version from six.moves.urllib import parse -DEFAULT_USER_AGENT = "openstacksdk/%s" % openstack.__version__ +DEFAULT_USER_AGENT = "openstacksdk/%s" % openstack_version.__version__ VERSION_PATTERN = re.compile('/v\d[\d.]*') diff --git a/openstack/version.py b/openstack/version.py new file mode 100644 index 000000000..7b1c884a7 --- /dev/null +++ b/openstack/version.py @@ -0,0 +1,16 @@ +# 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + + +import pbr.version + +__version__ = pbr.version.VersionInfo('openstacksdk').version_string()