Skip to content

Commit 80f24e5

Browse files
committed
[MERGE] Forward-port of branch 13.0 to 14.0
2 parents defd620 + 1f9cd60 commit 80f24e5

File tree

9 files changed

+18
-10
lines changed

9 files changed

+18
-10
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Pass WORKERS=auto for parallel build
44
ifndef WORKERS
5-
WORKERS = 1
5+
WORKERS = auto
66
endif
77

88
SPHINX_BUILD = sphinx-build
@@ -67,7 +67,7 @@ extensions/odoo_theme/static/style.css: extensions/odoo_theme/static/style.scss
6767

6868
#=== Development and debugging rules ===#
6969

70-
fast: SPHINXOPTS += -A collapse_menu=True -j auto
70+
fast: SPHINXOPTS += -A collapse_menu=True
7171
fast: html
7272

7373
static: extensions/odoo_theme/static/style.css

extensions/autodoc_placeholder/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ def setup(app):
2121
directives.register_directive('autoattribute', PlaceHolder)
2222

2323
return {
24-
'parallel_read_safe': False,
24+
'parallel_read_safe': True,
2525
'parallel_write_safe': True
2626
}

extensions/embedded_video/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ def setup(app):
6666
directives.register_directive('vimeo', Vimeo)
6767

6868
return {
69-
'parallel_read_safe': False,
69+
'parallel_read_safe': True,
7070
'parallel_write_safe': True
7171
}

extensions/exercise_admonition/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def setup(app):
2121
))
2222

2323
return {
24-
'parallel_read_safe': False,
24+
'parallel_read_safe': True,
2525
'parallel_write_safe': True
2626
}
2727

extensions/github_link/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def linkcode_resolve(domain, info):
7575
app.config.linkcode_resolve = linkcode_resolve
7676

7777
return {
78-
'parallel_read_safe': False,
78+
'parallel_read_safe': True,
7979
'parallel_write_safe': True
8080
}
8181

extensions/html_domain/__init__.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def setup(app):
4040
addnode(app, node, name)
4141

4242
return {
43-
'parallel_read_safe': False,
43+
'parallel_read_safe': True,
4444
'parallel_write_safe': True
4545
}
4646

@@ -183,3 +183,11 @@ class HtmlDomain(Domain):
183183
'var': makerole(var),
184184
'samp': makerole(samp),
185185
}
186+
187+
def merge_domaindata(self, docnames, otherdata) -> None:
188+
"""Merge in data regarding *docnames* from a different domaindata
189+
inventory (coming from a subprocess in parallel builds).
190+
"""
191+
# This extension doesn't store any data on the env
192+
# and therefore doesn't need to support this method.
193+
pass

extensions/odoo_theme/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def setup(app):
1616
app.add_js_file('js/page_toc.js')
1717

1818
return {
19-
'parallel_read_safe': False,
19+
'parallel_read_safe': True,
2020
'parallel_write_safe': True
2121
}
2222

extensions/redirects/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ def setup(app):
6464
app.connect('builder-inited', generate_redirects)
6565

6666
return {
67-
'parallel_read_safe': False,
67+
'parallel_read_safe': True,
6868
'parallel_write_safe': True
6969
}

extensions/switcher/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def setup(app):
1313
app.connect('env-updated', add_statics)
1414

1515
return {
16-
'parallel_read_safe': False,
16+
'parallel_read_safe': True,
1717
'parallel_write_safe': True
1818
}
1919

0 commit comments

Comments
 (0)