Fixed version numbers.

scipy_base/scipy_base_version.py

@@ -8,13 +8,20 @@
     cvs_minor = cvs_version[-3]
     cvs_serial = cvs_version[-1]
 except ImportError,msg:
-    print msg
     cvs_minor = 0
     cvs_serial = 0
 
-if release_level:
-    scipy_base_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
+if cvs_minor or cvs_serial:
+    if release_level:
+        scipy_base_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
+                             '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+    else:
+        scipy_base_version = '%(major)d.%(minor)d.%(micro)d'\
                               '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
 else:
-    scipy_base_version = '%(major)d.%(minor)d.%(micro)d'\
-                              '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+    if release_level:
+        scipy_base_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
+                             % (locals ())
+    else:
+        scipy_base_version = '%(major)d.%(minor)d.%(micro)d'\
+                             % (locals ())

scipy_distutils/scipy_distutils_version.py

@@ -8,13 +8,20 @@
     cvs_minor = cvs_version[-3]
     cvs_serial = cvs_version[-1]
 except ImportError,msg:
-    print msg
     cvs_minor = 0
     cvs_serial = 0
 
-if release_level:
-    scipy_distutils_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
+if cvs_minor or cvs_serial:
+    if release_level:
+        scipy_distutils_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
+                                  '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+    else:
+        scipy_distutils_version = '%(major)d.%(minor)d.%(micro)d'\
                               '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
 else:
-    scipy_distutils_version = '%(major)d.%(minor)d.%(micro)d'\
-                              '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+    if release_level:
+        scipy_distutils_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
+                                  % (locals ())
+    else:
+        scipy_distutils_version = '%(major)d.%(minor)d.%(micro)d'\
+                                  % (locals ())

scipy_test/scipy_test_version.py

@@ -8,13 +8,20 @@
     cvs_minor = cvs_version[-3]
     cvs_serial = cvs_version[-1]
 except ImportError,msg:
-    print msg
     cvs_minor = 0
     cvs_serial = 0
 
-if release_level:
-    scipy_test_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
-                              '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+if cvs_minor or cvs_serial:
+    if release_level:
+        scipy_test_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
+                             '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+    else:
+        scipy_test_version = '%(major)d.%(minor)d.%(micro)d'\
+                             '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
 else:
-    scipy_test_version = '%(major)d.%(minor)d.%(micro)d'\
-                              '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+    if release_level:
+        scipy_test_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
+                             % (locals ())
+    else:
+        scipy_test_version = '%(major)d.%(minor)d.%(micro)d'\
+                             % (locals ())

setup.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-Bundle of SciPy core modules:
+Bundle of Scipy core modules:
   scipy_test
   scipy_distutils
   scipy_base
@@ -49,20 +49,29 @@ def setup_package():
         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)
 
-        if release_level:
-            scipy_core_version = '%(major)d.%(minor)d.%(micro)d'\
-                                 '_%(release_level)s'\
-                                 '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+        if cvs_minor or cvs_serial:
+            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 ())
         else:
-            scipy_core_version = '%(major)d.%(minor)d.%(micro)d'\
-                                 '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+            if release_level:
+                scipy_core_version = '%(major)d.%(minor)d.%(micro)d'\
+                                     '_%(release_level)s'\
+                                     % (locals ())
+            else:
+                scipy_core_version = '%(major)d.%(minor)d.%(micro)d'\
+                                     % (locals ())
 
-        print 'SciPy Core Version %s' % scipy_core_version
+        print 'Scipy Core Version %s' % scipy_core_version
         setup( version = scipy_core_version,
-               maintainer = "SciPy Developers",
+               maintainer = "Scipy Developers",
                maintainer_email = "scipy-dev@scipy.org",
-               description = "SciPy core modules: scipy_{distutils,test,base}",
-               license = "SciPy License (BSD Style)",
+               description = "Scipy core modules: scipy_{distutils,test,base}, weave",
+               license = "Scipy License (BSD Style)",
                url = "http://www.scipy.org",
                **config_dict
                )

weave/setup.py

@@ -4,9 +4,7 @@
 from scipy_distutils.misc_util import get_path, merge_config_dicts
 from scipy_distutils.misc_util import package_config
 
-# Enough changes to bump the number.  We need a global method for
-# versioning
-version = "0.3.0"
+from weave_version import weave_version
 
 def stand_alone_package(with_dependencies = 0):
     path = get_path(__name__)
@@ -22,7 +20,7 @@ def stand_alone_package(with_dependencies = 0):
         print 'dep:', dependencies
         config_dict = package_config(primary,dependencies)
         config_dict['name'] = 'weave'
-        setup (version = version,
+        setup (version = weave_version,
                description = "Tools for inlining C/C++ in Python",
                author = "Eric Jones",
                author_email = "eric@enthought.com",

weave/setup_weave.py

@@ -50,7 +50,8 @@ def configuration(parent_package='',parent_path=None):
 
 if __name__ == '__main__':    
     from scipy_distutils.core import setup
-    setup(version = "0.3.0",
+    from weave_version import weave_version
+    setup(version = weave_version,
           description = "Tools for inlining C/C++ in Python",
           author = "Eric Jones",
           author_email = "eric@enthought.com",

weave/weave_version.py

@@ -8,13 +8,20 @@
     cvs_minor = cvs_version[-3]
     cvs_serial = cvs_version[-1]
 except ImportError,msg:
-    print msg
     cvs_minor = 0
     cvs_serial = 0
 
-if release_level:
-    weave_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
-                    '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+if cvs_minor or cvs_serial:
+    if release_level:
+        weave_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
+                        '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+    else:
+        weave_version = '%(major)d.%(minor)d.%(micro)d'\
+                        '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
 else:
-    weave_version = '%(major)d.%(minor)d.%(micro)d'\
-                    '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+    if release_level:
+        weave_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
+                        % (locals ())
+    else:
+        weave_version = '%(major)d.%(minor)d.%(micro)d'\
+                        % (locals ())