diff options
Diffstat (limited to 'setup.py')
| -rwxr-xr-x | setup.py | 33 |
1 files changed, 18 insertions, 15 deletions
@@ -33,6 +33,7 @@ Intended Audience :: Developers License :: OSI Approved Programming Language :: C Programming Language :: Python +Programming Language :: Python :: 3 Topic :: Software Development Topic :: Scientific/Engineering Operating System :: Microsoft :: Windows @@ -53,8 +54,8 @@ CLASSIFIERS = filter(None, CLASSIFIERS.split('\n')) AUTHOR = "Travis E. Oliphant, et.al." AUTHOR_EMAIL = "oliphant@enthought.com" PLATFORMS = ["Windows", "Linux", "Solaris", "Mac OS-X", "Unix"] -MAJOR = 2 -MINOR = 0 +MAJOR = 1 +MINOR = 6 MICRO = 0 ISRELEASED = False VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO) @@ -93,6 +94,20 @@ if os.path.exists('MANIFEST'): os.remove('MANIFEST') # a lot more robust than what was previously being used. builtins.__NUMPY_SETUP__ = True +# Construct full version info. Needs to be in setup.py namespace, otherwise it +# can't be accessed from pavement.py at build time. +FULLVERSION = VERSION +if not ISRELEASED: + if os.path.exists('.git'): + GIT_REVISION = git_version() + elif os.path.exists('numpy/version.py'): + # must be a source distribution, use existing version file + from numpy.version import git_revision as GIT_REVISION + else: + GIT_REVISION = "Unknown" + + FULLVERSION += '.dev-' + GIT_REVISION[:7] + def write_version_py(filename='numpy/version.py'): cnt = """ # THIS FILE IS GENERATED FROM NUMPY SETUP.PY @@ -105,22 +120,10 @@ release = %(isrelease)s if not release: version = full_version """ - FULL_VERSION = VERSION - if not ISRELEASED: - if os.path.exists('.git'): - GIT_REVISION = git_version() - elif os.path.exists(filename): - # must be a source distribution, use existing version file - from numpy.version import git_revision as GIT_REVISION - else: - GIT_REVISION = "Unknown" - - FULL_VERSION += '.dev-' + GIT_REVISION[:7] - a = open(filename, 'w') try: a.write(cnt % {'version': VERSION, - 'full_version' : FULL_VERSION, + 'full_version' : FULLVERSION, 'git_revision' : GIT_REVISION, 'isrelease': str(ISRELEASED)}) finally: |