summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-09 20:01:11 +0000
committerGerrit Code Review <review@openstack.org>2013-01-09 20:01:11 +0000
commit706cbdb57b2ed9cca29f04db0cc3700f7a04f985 (patch)
tree2d865f62ddcee94263f577b6c78b9aa0ef145e68
parent15be62b7f78c70829edd464cb0d209572aa040ce (diff)
parentbc972b214ee03d2b04ae9fe099e3ad59fd735b4b (diff)
downloadpython-heatclient-706cbdb57b2ed9cca29f04db0cc3700f7a04f985.tar.gz
Merge "Switch to using version.canonical_version_string"
-rw-r--r--heatclient/version.py3
-rw-r--r--setup.cfg5
-rwxr-xr-x[-rw-r--r--]setup.py5
3 files changed, 12 insertions, 1 deletions
diff --git a/heatclient/version.py b/heatclient/version.py
index a9498ad..7aafb43 100644
--- a/heatclient/version.py
+++ b/heatclient/version.py
@@ -15,5 +15,8 @@
from heatclient.openstack.common import version as common_version
+NEXT_VERSION = '0.2.0'
+
version_info = common_version.VersionInfo('heatclient',
+ pre_version=NEXT_VERSION,
python_package='python-heatclient')
diff --git a/setup.cfg b/setup.cfg
index ff57e67..727e83e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,3 +13,8 @@ all_files = 1
[upload_sphinx]
upload-dir = doc/build/html
+
+[egg_info]
+tag_build = dev
+tag_date = false
+tag_svn_revision = 0
diff --git a/setup.py b/setup.py
index 9c29f63..9de4201 100644..100755
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+#
# 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
@@ -14,6 +16,7 @@ import os
import setuptools
from heatclient.openstack.common import setup
+from heatclient.version import version_info as version
def read(fname):
@@ -21,7 +24,7 @@ def read(fname):
setuptools.setup(
name="python-heatclient",
- version=setup.get_post_version('heatclient'),
+ version=version.canonical_version_string(always=True),
author='Heat API Developers',
author_email='discuss@heat-api.org',
description="Client library for Heat orchestration API",