@@ -1,5 +1,6 @@ Sun, 08 Jun 2008 22:04:35 +0900 * add functions to query numscons version + * Release 0.7.3 Sun, 08 Jun 2008 18:24:28 +0900 * Handle msvc 2008 by using a custom msvc tool (inspired by VS 2008 Changelog @@ -5,5 +5,6 @@ recursive-include tools *.py configure configure.ac empty.f include setupegg.py include setup.py include release.py +include Changelog recursive-include numscons/core *.cfg recursive-include numscons/checkers *.cfg MANIFEST.in @@ -1,12 +1,10 @@ from subprocess import Popen, PIPE -from release import VERSION +from release import build_verstring, build_fverstring +import release -yop = VERSION.split('.') -try: - micro = int(yop[-1]) -except ValueError: - raise Exception("Bad micro version: version is %s" % VERSION) +if release.DEV: + raise Exception("Dev version ?") def nofailexec(cmd, cwd = None): p = Popen(cmd, cwd = cwd, shell = True) @@ -20,11 +18,12 @@ def make_tarballs(): def test_sanity(): # This executes numscons unit tests: this is far from convering everything, # but at least guarantees basic sanity of the package - cmd = "tar -xjf numscons-%s.tar.bz2" % VERSION + ver = build_verstring() + cmd = "tar -xjf numscons-%s.tar.bz2" % ver nofailexec([cmd], cwd = "dist") cmd = "python setup.py scons" - nofailexec([cmd], cwd = "dist/numscons-%s/tests" % VERSION) + nofailexec([cmd], cwd = "dist/numscons-%s/tests" % ver) def make_eggs(): # Build eggs for 2.4 and 2.5 @@ -49,3 +48,4 @@ make_tarballs() test_sanity() make_eggs() +register() do_release.py @@ -1,3 +1,5 @@ +import os + CLASSIFIERS = """\ Development Status :: 3 - Alpha Intended Audience :: Science/Research @@ -37,3 +39,10 @@ def build_fverstring(): else: return build_verstring() +def write_version(): + fname = os.path.join("numscons", "version.py") + f = open(fname, "w") + f.writelines("VERSION = %s\n" % build_verstring()) + f.writelines("DEV = %s" % DEV) + f.close() + release.py @@ -73,14 +73,7 @@ class sdist(old_sdist): # Main setup method import release as R -def write_version(): - fname = os.path.join("numscons", "version.py") - f = open(fname, "w") - f.writelines("VERSION = %s\n" % R.build_verstring()) - f.writelines("DEV = %s" % R.DEV) - f.close() - -write_version() +R.write_version() setup(cmdclass = {'install': install, 'install_data': install_data, 'sdist': sdist}, distclass = Distribution, name = R.NAME, setup.py @@ -10,8 +10,10 @@ if os.path.exists('MANIFEST'): os.remove('MANIFEST') # Main setup method import release as R + +R.write_version() setup(name = R.NAME, - version = R.VERSION, + version = R.build_fverstring(), description = R.DESCRIPTION, author = R.AUTHOR, author_email = R.AUTHOR_EMAIL, setupegg.py f298ff62dc8eae674a347a96f8ca01d607092906 david david@davids-macbook.local http://github.com/cournape/numscons/commit/636fdb7e53372faccbf641f97e4cdd8d484b970e 636fdb7e53372faccbf641f97e4cdd8d484b970e 2008-06-08T06:54:30-07:00 2008-06-08T06:54:30-07:00 More fixes for release scripts. cd3b92fd9ce0f616eb6e3c84630675de77a95263 david david@davids-macbook.local