Merge lp:~jbaudoux/anybox.recipe.openerp/1_7_version_string_decoding_for_saas_releases into lp:anybox.recipe.openerp

[Jacques-Etienne Baudoux]

I improved the function major_version(version_string) for supporting OpenERP saas releases (e.g. 7.saas~1). They are short-lived stable versions between two "X.0" LTS releases. The second version number does not contain a numeric value.
To be compatible with existing code, a numeric value is returned.
I have chosen to return the value X.5 (e.g. 7.5) that I found the most in accordance to the concept of those releases.

[Georges Racinet (gracinet)]

I agree with the version numbering. It's not that important, because this version number is somewhat transient. It's used as the basis for version independency (for instance, for v5.0, there's some cleaning to be done before exit, that sort of thing)

Therefore, if we change our minds in a later version, users would either not re-buildout or they would and in both cases, the state would be consistent.

[Georges Racinet (gracinet)]

Again, thanks for the contribution.
Just merged, but I had to rewrite it to restore some other version schemes that got broken, and that the unit tests detected (after a bit of adaptation, I went back to the regexp).

This will be treated as a merge by bzr, though.

The documentation on how to launch the unit tests has been written since you submitted this merge request: http://docs.anybox.fr/anybox.recipe.openerp/trunk/contributing.html (comments welcomed)

Regards,

=== modified file 'anybox/recipe/openerp/utils.py'
--- anybox/recipe/openerp/utils.py	2013-08-27 09:29:47 +0000
+++ anybox/recipe/openerp/utils.py	2013-09-08 13:19:48 +0000
@@ -1,6 +1,6 @@
 import os
 import sys
-import re
+import string
 import subprocess
 from contextlib import contextmanager
 import logging
@@ -43,11 +43,6 @@
             yield f
 
 
-NIGHTLY_VERSION_RE = re.compile(r'(\d+)[.](\d+)-(\d+-\d+)$')
-
-MAJOR_VERSION_RE = re.compile(r'(\d+)[.](\d+)')
-
-
 def major_version(version_string):
     """The least common denominator of OpenERP versions : two numbers.
 
@@ -58,11 +53,25 @@
     Beware, the packaging script does funny things, such as labeling current
     nightlies as 6.2-date-time whereas version_info is (7, 0, 0, ALPHA)
     We can in recipe code check for >= (6, 2), that's not a big issue.
+
+    Regarding OpenERP saas releases (e.g. 7.saas~1) that are short-lived stable
+    versions between two "X.0" LTS releases, the second version number does not
+    contain a numeric value. The value X.5 will be returned (e.g. 7.5).
     """
 
-    m = MAJOR_VERSION_RE.match(version_string)
-    if m is not None:
-        return tuple(int(m.group(i)) for i in (1, 2))
+    version = version_string.split('.', 3)
+    assert len(version) >= 2, ('Version string must have a major and minor '
+        'number: "%s".' % version_string)
+    major = version[0]
+    minor = version[1]
+    if not all(ch in set(string.digits) for ch in major):
+        raise ValueError('Cannot decode version number "%s". Major is not a '
+                         'number.' % version_string)
+    if all(ch in set(string.digits) for ch in minor):
+        return (int(major), int(minor))
+    elif minor.startswith('saas'):
+        return (int(major), 5)
+    raise ValueError('Cannot decode version number "%s".' % version_string)
 
 
 def mkdirp(path):