Update django.VERSION in trunk per previous discussion

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9103 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
James Bennett 2008-09-30 17:50:44 +00:00
parent 97087962b1
commit 8e608c2155
1 changed files with 15 additions and 7 deletions

View File

@ -1,9 +1,17 @@
VERSION = (1, 0, 'post-release-SVN') VERSION = (1, 1, 0, 'alpha', 0)
def get_version(): def get_version():
"Returns the version as a human-format string." version = '%s.%s' % (VERSION[0], VERSION[1])
v = '.'.join([str(i) for i in VERSION[:-1]]) if VERSION[2]:
if VERSION[-1]: version = '%s.%s' % (version, VERSION[2])
from django.utils.version import get_svn_revision if VERSION[3:] == ('alpha', 0):
v = '%s-%s-%s' % (v, VERSION[-1], get_svn_revision()) version = '%s pre-alpha' % version
return v else:
version = '%s %s' % (version, VERSION[3])
if VERSION[3] != 'final':
version = '%s %s' % (version, VERSION[4])
from django.utils.version import get_svn_revision
svn_rev = get_svn_revision()
if svn_rev != u'SVN-unknown':
version = "%s %s" % (version, svn_rev)
return version