From d8e22e7e6479aa38b62c53f14ebaf98328131061 Mon Sep 17 00:00:00 2001
From: Pearu Peterson <pearu.peterson@gmail.com>
Date: Fri, 2 Apr 2004 21:40:12 +0000
Subject: Prepearing to tag scipy tree (unified micro version numbers)

---
 scipy_base/scipy_base_version.py |  2 +-
 scipy_test/scipy_test_version.py |  2 +-
 setup.py                         | 11 ++++++++---
 weave/weave_version.py           |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/scipy_base/scipy_base_version.py b/scipy_base/scipy_base_version.py
index 00761fcc0..65ae0bf68 100644
--- a/scipy_base/scipy_base_version.py
+++ b/scipy_base/scipy_base_version.py
@@ -1,6 +1,6 @@
 major = 0
 minor = 2
-micro = 1
+micro = 2
 release_level = 'alpha'
 
 from __cvs_version__ import cvs_version
diff --git a/scipy_test/scipy_test_version.py b/scipy_test/scipy_test_version.py
index b798b2b2f..426cd9a9f 100644
--- a/scipy_test/scipy_test_version.py
+++ b/scipy_test/scipy_test_version.py
@@ -1,6 +1,6 @@
 major = 0
 minor = 2
-micro = 1
+micro = 2
 release_level = 'alpha'
 
 from __cvs_version__ import cvs_version
diff --git a/setup.py b/setup.py
index 5a61f54b7..7ccb46933 100755
--- a/setup.py
+++ b/setup.py
@@ -45,12 +45,17 @@ def setup_package():
         minor = max([v.minor for v in versions])
         micro = max([v.micro for v in versions])
         release_level = min([v.release_level for v in versions])
+        release_level = ''
         cvs_minor = reduce(lambda a,b:a+b,[v.cvs_minor for v in versions],0)
         cvs_serial = reduce(lambda a,b:a+b,[v.cvs_serial for v in versions],0)
 
-        scipy_core_version = '%(major)d.%(minor)d.%(micro)d'\
-                             '_%(release_level)s'\
-                             '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+        if release_level:
+            scipy_core_version = '%(major)d.%(minor)d.%(micro)d'\
+                                 '_%(release_level)s'\
+                                 '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+        else:
+            scipy_core_version = '%(major)d.%(minor)d.%(micro)d'\
+                                 '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
 
         print 'SciPy Core Version %s' % scipy_core_version
         setup( version = scipy_core_version,
diff --git a/weave/weave_version.py b/weave/weave_version.py
index 82963307f..dc468bf1a 100644
--- a/weave/weave_version.py
+++ b/weave/weave_version.py
@@ -1,6 +1,6 @@
 major = 0
 minor = 2
-micro = 1
+micro = 2
 release_level = 'alpha'
 
 from __cvs_version__ import cvs_version
-- 
cgit v1.2.1