Permalink
Browse files

Prepearing to tag scipy tree (unified micro version numbers)

  • Loading branch information...
1 parent 02ede8c commit d8e22e7e6479aa38b62c53f14ebaf98328131061 @pearu pearu committed Apr 2, 2004
Showing with 11 additions and 6 deletions.
  1. +1 −1 scipy_base/scipy_base_version.py
  2. +1 −1 scipy_test/scipy_test_version.py
  3. +8 −3 setup.py
  4. +1 −1 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
@@ -1,6 +1,6 @@
major = 0
minor = 2
-micro = 1
+micro = 2
release_level = 'alpha'
from __cvs_version__ import cvs_version
View
@@ -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,
View
@@ -1,6 +1,6 @@
major = 0
minor = 2
-micro = 1
+micro = 2
release_level = 'alpha'
from __cvs_version__ import cvs_version

0 comments on commit d8e22e7

Please sign in to comment.