From 4d774dbdbf68b8e6ac267e6b2db359d4a7b49aff Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Wed, 2 Nov 2011 15:33:14 -0400
Subject: Use pure version number ("2012.1") in tarball name

Makes setup.py use a canonical_version() function that returns the pure
(final) version number. That version number is used in tarball name and
as the main tarball directory. This brings Keystone in line with the
other core projects and needs to be in before Essex-1 delivery.

Change-Id: I8adb45ccc619a9a77d7a4da013d7cc9cf6277f86
---
 AUTHORS              | 1 +
 keystone/__init__.py | 4 ++++
 setup.py             | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 5c93ae68..2544b23b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,6 +30,7 @@ Sai Krishna <saikrishna1511@gmail.com>
 Sirish Bitra <sirish.bitra@gmail.com>
 Sony K. Philip <sony@hcleai.com>
 termie <github@anarkystic.com>
+Thierry Carrez <thierry@openstack.org>
 Todd Willey <xtoddx@gmail.com>
 Vishvananda Ishaya <vishvananda@gmail.com>
 Yogeshwar Srikrishnan <yoga80@yahoo.com>
diff --git a/keystone/__init__.py b/keystone/__init__.py
index 68bc1057..226b09ae 100644
--- a/keystone/__init__.py
+++ b/keystone/__init__.py
@@ -23,6 +23,10 @@ RELEASE_VERSION = "2012.1"
 RELEASE_VERSION_FINAL = False  # becomes true at Release Candidate time
 
 
+def canonical_version():
+    return RELEASE_VERSION
+
+
 def version():
     if RELEASE_VERSION_FINAL:
         return RELEASE_VERSION
diff --git a/setup.py b/setup.py
index 2d99642e..6337dc92 100755
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ except:
 
 setup(
     name='keystone',
-    version=keystone.version(),
+    version=keystone.canonical_version(),
     description="Authentication service - proposed for OpenStack",
     license='Apache License (2.0)',
     classifiers=["Programming Language :: Python"],
-- 
cgit