Merge PR #3170 into 18.0

Signed-off-by StefanRijnhart

requirements.txt

@@ -1,6 +1,5 @@
 # generated from manifests external_dependencies
 astor
 dataclasses
-mako
 odoorpc
 openupgradelib

upgrade_analysis/__manifest__.py

@@ -22,7 +22,7 @@
     "installable": True,
     "depends": ["base"],
     "external_dependencies": {
-        "python": ["mako", "dataclasses", "odoorpc", "openupgradelib"],
+        "python": ["dataclasses", "odoorpc", "openupgradelib"],
     },
     "license": "AGPL-3",
 }

upgrade_analysis/models/upgrade_analysis.py

@@ -10,7 +10,6 @@
 from copy import deepcopy
 
 from lxml import etree
-from mako.template import Template
 
 from odoo import fields, models, release
 from odoo.exceptions import ValidationError
@@ -519,15 +518,6 @@ def generate_module_coverage_file(self, no_changes_modules):
         if not module_coverage_file_folder:
             return
 
-        file_template = Template(
-            filename=os.path.join(
-                get_module_path("upgrade_analysis"),
-                "static",
-                "src",
-                "module_coverage_template.rst.mako",
-            )
-        )
-
         module_domain = [
             ("state", "=", "installed"),
             (
@@ -587,10 +577,13 @@ def generate_module_coverage_file(self, no_changes_modules):
                 49, " "
             )
 
-        rendered_text = file_template.render(
-            start_version=start_version,
-            end_version=end_version,
-            module_descriptions=module_descriptions,
+        rendered_text = self.env["ir.qweb"]._render(
+            "upgrade_analysis.module_coverage",
+            values=dict(
+                start_version=start_version,
+                end_version=end_version,
+                module_descriptions=module_descriptions,
+            ),
         )
 
         file_name = "modules{}-{}.rst".format(

upgrade_analysis/static/src/module_coverage_template.rst.mako → upgrade_analysis/templates/module_coverage_template.xml

@@ -1,12 +1,17 @@
-Module coverage ${start_version} -> ${end_version}
+<odoo>
+    <template id="module_coverage">Module coverage <t t-out="start_version" /> -> <t
+        t-out="end_version"
+    />
 ============================
 
 .. include:: coverage_legend.rst
 
 +---------------------------------------------------+----------------------+-------------------------------------------------+
 | Module                                            | Status               + Extra Information                               |
 +===================================================+======================+=================================================+
-% for module, extra_information in module_descriptions.items():
-|${module}|                      |${extra_information}|
+<t t-foreach="module_descriptions" t-as="module">
+|<t t-out="module" />|                      |<t t-out="module_value" />|
 +---------------------------------------------------+----------------------+-------------------------------------------------+
-% endfor
+</t>
+</template>
+</odoo>