openstack
/
openstacksdk
Code Issues Proposed changes

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
This commit is contained in:
tengqm 2016-06-03 03:13:15 -04:00
parent f50a881371
commit 2f05a3d066
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openstack/__init__.py
View File

@ -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()

4
openstack/session.py
View File

@ -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.]*')

16
openstack/version.py Normal file
View File

@ -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()