conf2reST.py: Also detect group of modules (like oca)

conf2reST.py

@@ -113,7 +113,7 @@
     _logger.info("Odoo version %s", odoo_version)
     rst = {
         'odoo': {"Odoo": {'version': odoo_version}},
-        'tools': {}, 'modules': {}, 'other': {},
+        'tools': {}, 'modules': {}, 'other': {}, 'group of modules': {}
     }
     # load the conf file
     # test if there is a .hgconf file
@@ -123,9 +123,9 @@
         parser = ConfigParser.ConfigParser()
         parser.read(hgconf_path)
         for section in parser.sections():
-            if parser.get(section, 'layout') == 'odoo_scripts':
-                rst['tools']['odoo_scripts'] = {
-                    'version': parser.get(section, 'track'),
-                    'repository': parser.get(section, 'pulluri'),
-                }
+            layout = parser.get(section, 'layout')
+            if layout == 'odoo_scripts':
+                group = 'tools'
+            elif any(layout == addon_dir for addon_dir in addon_dirs):
+                group = 'group of modules'
             elif any(
@@ -131,4 +131,3 @@
             elif any(
-                    parser.get(section, 'layout').startswith(dir)
-                    for dir in addon_dirs
+                layout.startswith(addon_dir) for addon_dir in addon_dirs
             ):
@@ -134,6 +133,3 @@
             ):
-                rst['modules'][section] = {
-                    'version': parser.get(section, 'track'),
-                    'repository': parser.get(section, 'pulluri'),
-                }
+                group = 'modules'
             else:
@@ -139,8 +135,9 @@
             else:
-                rst['other'][section] = {
-                    'version': parser.get(section, 'track'),
-                    'repository': parser.get(section, 'pulluri'),
-                }
+                group = 'other'
+            rst[group][section] = {
+                'version': parser.get(section, 'track'),
+                'repository': parser.get(section, 'pulluri'),
+            }
 
     # handle nest.yaml case
     confnest_path = os.path.join(directory, 'nest.yaml')
@@ -150,7 +147,18 @@
         data = yaml.safe_load(stream)
         repos = data['repos']
         for module in repos:
-            rst['modules'][module] = {
+            layout == repos[module]['layout']
+            if layout == 'odoo_scripts':
+                group = 'tools'
+            elif any(layout == addon_dir for addon_dir in addon_dirs):
+                group = 'group of modules'
+            elif any(
+                layout.startswith(addon_dir) for addon_dir in addon_dirs
+            ):
+                group = 'modules'
+            else:
+                group = 'other'
+            rst[section][module] = {
                 'version': repos[module]['track'],
                 'repository': repos[module]['pulluri'],
             }
@@ -168,7 +176,7 @@
     """
     out.write("Versions\n")
     out.write("========\n\n")
-    for group in ('odoo', 'modules', 'other', 'tools'):
+    for group in ('odoo', 'modules', 'group of modules', 'other', 'tools'):
         if rst.get(group):
             out.write(".. list-table:: %s\n" % group)
             out.write("   :widths: 2 3\n")