Skip to content

Commit 63d13a7

Browse files
committed
Merge PR #3170 into 18.0
Signed-off-by StefanRijnhart
2 parents 8bf125f + 3cbc385 commit 63d13a7

File tree

4 files changed

+17
-20
lines changed

4 files changed

+17
-20
lines changed

requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# generated from manifests external_dependencies
22
astor
33
dataclasses
4-
mako
54
odoorpc
65
openupgradelib

upgrade_analysis/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"installable": True,
2323
"depends": ["base"],
2424
"external_dependencies": {
25-
"python": ["mako", "dataclasses", "odoorpc", "openupgradelib"],
25+
"python": ["dataclasses", "odoorpc", "openupgradelib"],
2626
},
2727
"license": "AGPL-3",
2828
}

upgrade_analysis/models/upgrade_analysis.py

+7-14
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
from copy import deepcopy
1111

1212
from lxml import etree
13-
from mako.template import Template
1413

1514
from odoo import fields, models, release
1615
from odoo.exceptions import ValidationError
@@ -519,15 +518,6 @@ def generate_module_coverage_file(self, no_changes_modules):
519518
if not module_coverage_file_folder:
520519
return
521520

522-
file_template = Template(
523-
filename=os.path.join(
524-
get_module_path("upgrade_analysis"),
525-
"static",
526-
"src",
527-
"module_coverage_template.rst.mako",
528-
)
529-
)
530-
531521
module_domain = [
532522
("state", "=", "installed"),
533523
(
@@ -587,10 +577,13 @@ def generate_module_coverage_file(self, no_changes_modules):
587577
49, " "
588578
)
589579

590-
rendered_text = file_template.render(
591-
start_version=start_version,
592-
end_version=end_version,
593-
module_descriptions=module_descriptions,
580+
rendered_text = self.env["ir.qweb"]._render(
581+
"upgrade_analysis.module_coverage",
582+
values=dict(
583+
start_version=start_version,
584+
end_version=end_version,
585+
module_descriptions=module_descriptions,
586+
),
594587
)
595588

596589
file_name = "modules{}-{}.rst".format(
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
Module coverage ${start_version} -> ${end_version}
1+
<odoo>
2+
<template id="module_coverage">Module coverage <t t-out="start_version" /> -> <t
3+
t-out="end_version"
4+
/>
25
============================
36

47
.. include:: coverage_legend.rst
58

69
+---------------------------------------------------+----------------------+-------------------------------------------------+
710
| Module | Status + Extra Information |
811
+===================================================+======================+=================================================+
9-
% for module, extra_information in module_descriptions.items():
10-
|${module}| |${extra_information}|
12+
<t t-foreach="module_descriptions" t-as="module">
13+
|<t t-out="module" />| |<t t-out="module_value" />|
1114
+---------------------------------------------------+----------------------+-------------------------------------------------+
12-
% endfor
15+
</t>
16+
</template>
17+
</odoo>

0 commit comments

Comments
 (0)