Changed version number string. Important for building portable version.

Used alpha|beta|rc without git commit hash.
Added 'dev' suffix which use git hash only. It is easier to handle in file names of releases.
This commit is contained in:
Emanuel Schuetze 2012-10-31 07:11:53 +01:00
parent 8ffeadfe88
commit d9ccb02969

View File

@ -16,7 +16,7 @@ def get_version(version=None):
if version is None:
version = VERSION
assert len(version) == 5
assert version[3] in ('alpha', 'beta', 'rc', 'final')
assert version[3] in ('dev', 'alpha', 'beta', 'rc', 'final')
# Now build the two parts of the version number:
# main = X.Y[.Z]
@ -27,8 +27,7 @@ def get_version(version=None):
main = '.'.join(str(x) for x in version[:main_parts])
if version[3] != 'final':
mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'c'}
sub = mapping[version[3]] + str(version[4])
if version[3] == 'dev':
try:
git_head_path = '.git/' + open('.git/HEAD', 'r').read()[5:].rstrip()
except IOError:
@ -36,7 +35,9 @@ def get_version(version=None):
else:
import os
git_commit_id = open(os.path.abspath(git_head_path), 'r').read().rstrip()
sub = '%s commit %s' % (sub, git_commit_id)
sub = '-%s%s' % (version[3], git_commit_id)
else:
sub = '-' + version[3] + str(version[4])
else:
sub = ''