Skip to content

Commit

Permalink
Migrate to pbr.
Browse files Browse the repository at this point in the history
openstack.common.setup and openstack.common.version are now in the
standalone library pbr, so all projects using those two should
migrate.

Fixes bug 1179007.

Change-Id: I7ac1c37f0bf148619dffff8f454db05fc192e471
  • Loading branch information
Roman Podolyaka committed May 19, 2013
1 parent 64e43fd commit f08ac04
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 505 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Expand Up @@ -11,8 +11,8 @@ cover
*~
build
dist
python_novaclient.egg-info
AUTHORS
ChangeLog
novaclient/versioninfo
setuptools_git-*.egg/
*.egg
*egg-info
11 changes: 3 additions & 8 deletions novaclient/__init__.py
Expand Up @@ -12,12 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.

from novaclient.openstack.common import version
import pbr.version

version_info = version.VersionInfo('python-novaclient')
# 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

__version__ = pbr.version.VersionInfo('python-novaclient').version_string()
367 changes: 0 additions & 367 deletions novaclient/openstack/common/setup.py

This file was deleted.

0 comments on commit f08ac04

Please sign in to comment.