Merge lp:~jbaudoux/anybox.recipe.openerp/saas3-gevent into lp:anybox.recipe.openerp/1.8

[Jacques-Etienne Baudoux]

This branch is also valid for merging into 1.8

Description of MP for trunk:
gevent has been introduced in 7.saas~3 and not in 8.0
I'm changing the tests to apply gevent specific code from (7, 3) versions (it was (8, 0)).
I also replaced the minor version decode for saas release. In a previous merged MP I did for saas~1, it was always decoded as (7, 5). Now, it's decoded as (7, X) where X is the saas release. This solves release decode for all existing versions up to now.

[Georges Racinet (gracinet)]

Merged ! Many thanks

review: Approve

=== modified file 'anybox/recipe/openerp/base.py'
--- anybox/recipe/openerp/base.py	2014-06-08 20:12:57 +0000
+++ anybox/recipe/openerp/base.py	2014-07-22 12:18:56 +0000
@@ -688,7 +688,7 @@
         if self.major_version >= (6, 2):
             # TODO still necessary ?
             extra.append(self.openerp_dir)
-            if self.major_version < (8, 0):
+            if self.major_version < (7, 3):
                 extra.append(join(self.openerp_dir, 'addons'))
         else:
             extra.extend((join(self.openerp_dir, 'bin'),

=== modified file 'anybox/recipe/openerp/runtime/start_openerp.py'
--- anybox/recipe/openerp/runtime/start_openerp.py	2014-05-29 16:13:23 +0000
+++ anybox/recipe/openerp/runtime/start_openerp.py	2014-07-22 12:18:56 +0000
@@ -60,7 +60,7 @@
     if version == (5, 0):
         patch_openerp_v5.do_patch()
 
-    if version >= (8, 0):
+    if version >= (7, 3):
         assert gevent_script_path is not None
         patch_odoo.do_patch(gevent_script_path)
 

=== modified file 'anybox/recipe/openerp/server.py'
--- anybox/recipe/openerp/server.py	2014-06-08 11:05:22 +0000
+++ anybox/recipe/openerp/server.py	2014-07-22 12:18:56 +0000
@@ -76,7 +76,7 @@
 
         self.with_openerp_command = (
             (self.with_devtools and self.major_version >= (6, 2)
-             or self.major_version >= (8, 0)))
+             or self.major_version >= (7, 3)))
 
     def merge_requirements(self):
         """Prepare for installation by zc.recipe.egg
@@ -117,7 +117,7 @@
         if self.with_devtools:
             self.requirements.extend(devtools.requirements)
 
-        if self.with_openerp_command and self.major_version < (8, 0):
+        if self.with_openerp_command and self.major_version < (7, 3):
             self.requirements.append('openerp-command')
 
         BaseRecipe.merge_requirements(self)
@@ -289,7 +289,7 @@
         arguments = '%r, %r, version=%r' % (self._get_server_command(),
                                             self.config_path,
                                             self.major_version)
-        if self.major_version >= (8, 0):
+        if self.major_version >= (7, 3):
             arguments += ', gevent_script_path=%r' % self.gevent_script_path
 
         desc.update(arguments=arguments)
@@ -320,7 +320,7 @@
             self._get_server_command(),
             self.config_path,
             self.major_version)
-        if self.major_version >= (8, 0):
+        if self.major_version >= (7, 3):
             arguments += ', gevent_script_path=%r' % self.gevent_script_path
 
         desc.update(
@@ -389,7 +389,7 @@
     def _register_openerp_command(self, qualified_name):
         """Register https://launchpad.net/openerp-command for install.
         """
-        if self.major_version < (8, 0):
+        if self.major_version < (7, 3):
             logger.warn("Installing separate openerp-command as %r. "
                         "In OpenERP 7, openerp-command used to be "
                         "an independent python distribution, ready for "
@@ -574,14 +574,14 @@
              'upgrade'),
         ))
 
-        if self.major_version >= (8, 0):
+        if self.major_version >= (7, 3):
             self.eggs_reqs.append(('oe', 'openerpcommand.main', 'run'))
             self.eggs_reqs.append(('openerp-gevent', 'openerp.cli', 'main'))
 
         self._install_interpreter()
 
         main_script = self.options.get('script_name', 'start_' + self.name)
-        if self.major_version >= (8, 0):
+        if self.major_version >= (7, 3):
             gevent_script_name = self.options.get('gevent_script_name',
                                                   'gevent_%s' % self.name)
             self._register_gevent_script(gevent_script_name)

=== modified file 'anybox/recipe/openerp/utils.py'
--- anybox/recipe/openerp/utils.py	2014-07-09 16:44:17 +0000
+++ anybox/recipe/openerp/utils.py	2014-07-22 12:18:56 +0000
@@ -7,7 +7,7 @@
 logger = logging.getLogger(__name__)
 
 
-MAJOR_VERSION_RE = re.compile(r'(\d+)[.](\d*)(\w*)')
+MAJOR_VERSION_RE = re.compile(r'(\d+)[.](saas~|)(\d*)(\w*)')
 
 
 class WorkingDirectoryKeeper(object):
@@ -67,11 +67,11 @@
     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)::
+    versions between two "X.0" LTS releases, the 'saas~' argument before the
+    minor version number is stripped. For instance::
 
-       >>> major_version('7.saas~1')
-       (7, 5)
+       >>> major_version('7.saas~3')
+       (7, 3)
 
     """
 
@@ -81,9 +81,7 @@
         raise ValueError("Unparseable version string: %r" % version_string)
 
     major = int(m.group(1))
-    minor = m.group(2)
-    if not minor and m.group(3).startswith('saas'):
-        return major, 5
+    minor = m.group(3)
 
     try:
         return major, int(minor)