From 5b8d5b739a32365aeae49400cc376a42389bc13b Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 5 Jan 2013 02:49:54 +0000 Subject: [PATCH] Version back to 4.0.0-alpha3; handle version number in const.py svn: r20991 --- gramps/gen/const.py.in | 11 ++++++++++- setup.py | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gramps/gen/const.py.in b/gramps/gen/const.py.in index 8d29c7ca4..fe6863d43 100644 --- a/gramps/gen/const.py.in +++ b/gramps/gen/const.py.in @@ -54,7 +54,16 @@ PROGRAM_NAME = "Gramps" VERSION = "@VERSIONSTRING@" if VERSION == "@" + "VERSIONSTRING" + "@": raise Exception("Please run 'python setup.py build'") -VERSION_TUPLE = tuple(map(int, VERSION.split("."))) +def get_version_tuple(v): + """ Get the numeric-dotted part of version number""" + retval = "" + for c in v: + if c.isdigit() or (c == "." and retval.count(".") <= 1): + retval += c + else: + break + return tuple(map(int, retval.split("."))) +VERSION_TUPLE = get_version_tuple(VERSION) major_version = "%s.%s" % (VERSION_TUPLE[0], VERSION_TUPLE[1]) VERSION += get_svn_revision() diff --git a/setup.py b/setup.py index cbf54c9a4..3c429c172 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ if sys.version_info[0] < 3: import commands from stat import ST_MODE -VERSION = '4.0.0' +VERSION = '4.0.0-alpha3' ALL_LINGUAS = ('bg', 'ca', 'cs', 'da', 'de', 'el', 'en_GB', 'es', 'fi', 'fr', 'he', 'hr', 'hu', 'it', 'ja', 'lt', 'nb', 'nl', 'nn', 'pl', 'pt_BR', 'pt_PT', 'ru', 'sk', 'sl', 'sq', 'sv', 'uk', 'vi', 'zh_CN')