From 32a8feb361257a5c87fb68bbefbeca7b0f386f88 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 29 Apr 2013 14:08:26 +0200 Subject: [PATCH 1/3] [VERSION] update version to reflet reality bzr revid: chs@openerp.com-20130429120826-rhej168qhyai8iqa --- openerp/release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/release.py b/openerp/release.py index 50bcd0c81e1..e68d90f3473 100644 --- a/openerp/release.py +++ b/openerp/release.py @@ -30,7 +30,7 @@ RELEASE_LEVELS_DISPLAY = {ALPHA: ALPHA, # properly comparable using normal operarors, for example: # (6,1,0,'beta',0) < (6,1,0,'candidate',1) < (6,1,0,'candidate',2) # (6,1,0,'candidate',2) < (6,1,0,'final',0) < (6,1,2,'final',0) -version_info = (7, 0, 0, FINAL, 0) +version_info = (7, 'saas-1', 0, FINAL, 0) version = '.'.join(map(str, version_info[:2])) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '') serie = major_version = '.'.join(map(str, version_info[:2])) From a6f724c9196efd323675a7d4ea5a9a8a26157b7b Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 30 Apr 2013 16:20:37 +0200 Subject: [PATCH 2/3] [IMP] parse_version: ignore saas~ componants bzr revid: chs@openerp.com-20130430142037-zuxzk8vy9td89pv1 --- openerp/tools/parse_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/tools/parse_version.py b/openerp/tools/parse_version.py index 316f102a5e6..3a21b23e797 100644 --- a/openerp/tools/parse_version.py +++ b/openerp/tools/parse_version.py @@ -25,7 +25,7 @@ import re component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE) -replace = {'pre':'c', 'preview':'c','-':'final-','_':'final-','rc':'c','dev':'@'}.get +replace = {'pre':'c', 'preview':'c','-':'final-','_':'final-','rc':'c','dev':'@','saas':'','~':''}.get def _parse_version_parts(s): for part in component_re.split(s): From 6dc9530261eee5fdb6a210632a059b925517092a Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 30 Apr 2013 16:29:38 +0200 Subject: [PATCH 3/3] [IMP] new version number pattern bzr revid: chs@openerp.com-20130430142938-1wwwhrnmv1r58pe3 --- openerp/release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/release.py b/openerp/release.py index e68d90f3473..3990b1c2fa4 100644 --- a/openerp/release.py +++ b/openerp/release.py @@ -30,7 +30,7 @@ RELEASE_LEVELS_DISPLAY = {ALPHA: ALPHA, # properly comparable using normal operarors, for example: # (6,1,0,'beta',0) < (6,1,0,'candidate',1) < (6,1,0,'candidate',2) # (6,1,0,'candidate',2) < (6,1,0,'final',0) < (6,1,2,'final',0) -version_info = (7, 'saas-1', 0, FINAL, 0) +version_info = (7, 'saas~1', 0, FINAL, 0) version = '.'.join(map(str, version_info[:2])) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '') serie = major_version = '.'.join(map(str, version_info[:2]))