NextERP/documentation
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Forward-port of branch 12.0 to 13.0

Browse Source
This commit is contained in:
Antoine Vandevenne (anv) 2021-05-20 14:46:35 +02:00
commit 1f9cd600cc
9 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -2,7 +2,7 @@
# Pass WORKERS=auto for parallel build # Pass WORKERS=auto for parallel build
ifndef WORKERS ifndef WORKERS
WORKERS = 1 WORKERS = auto
endif endif
SPHINX_BUILD = sphinx-build SPHINX_BUILD = sphinx-build
@ -67,7 +67,7 @@ extensions/odoo_theme/static/style.css: extensions/odoo_theme/static/style.scss
#=== Development and debugging rules ===# #=== Development and debugging rules ===#
fast: SPHINXOPTS += -A collapse_menu=True -j auto fast: SPHINXOPTS += -A collapse_menu=True
fast: html fast: html
static: extensions/odoo_theme/static/style.css static: extensions/odoo_theme/static/style.css

2
extensions/autodoc_placeholder/__init__.py
View File

@ -21,6 +21,6 @@ def setup(app):
directives.register_directive('autoattribute', PlaceHolder) directives.register_directive('autoattribute', PlaceHolder)
return { return {
'parallel_read_safe': False, 'parallel_read_safe': True,
'parallel_write_safe': True 'parallel_write_safe': True
} }

2
extensions/embedded_video/__init__.py
View File

@ -66,6 +66,6 @@ def setup(app):
directives.register_directive('vimeo', Vimeo) directives.register_directive('vimeo', Vimeo)
return { return {
'parallel_read_safe': False, 'parallel_read_safe': True,
'parallel_write_safe': True 'parallel_write_safe': True
} }

2
extensions/exercise_admonition/__init__.py
View File

@ -21,7 +21,7 @@ def setup(app):
)) ))
return { return {
'parallel_read_safe': False, 'parallel_read_safe': True,
'parallel_write_safe': True 'parallel_write_safe': True
} }

2
extensions/github_link/__init__.py
View File

@ -75,7 +75,7 @@ def setup(app):
app.config.linkcode_resolve = linkcode_resolve app.config.linkcode_resolve = linkcode_resolve
return { return {
'parallel_read_safe': False, 'parallel_read_safe': True,
'parallel_write_safe': True 'parallel_write_safe': True
} }

10
extensions/html_domain/__init__.py
View File

@ -40,7 +40,7 @@ def setup(app):
addnode(app, node, name) addnode(app, node, name)
return { return {
'parallel_read_safe': False, 'parallel_read_safe': True,
'parallel_write_safe': True 'parallel_write_safe': True
} }
@ -183,3 +183,11 @@ class HtmlDomain(Domain):
'var': makerole(var), 'var': makerole(var),
'samp': makerole(samp), 'samp': makerole(samp),
} }
def merge_domaindata(self, docnames, otherdata) -> None:
"""Merge in data regarding *docnames* from a different domaindata
inventory (coming from a subprocess in parallel builds).
"""
# This extension doesn't store any data on the env
# and therefore doesn't need to support this method.
pass

2
extensions/odoo_theme/__init__.py
View File

@ -16,7 +16,7 @@ def setup(app):
app.add_js_file('js/page_toc.js') app.add_js_file('js/page_toc.js')
return { return {
'parallel_read_safe': False, 'parallel_read_safe': True,
'parallel_write_safe': True 'parallel_write_safe': True
} }

2
extensions/redirects/__init__.py
View File

@ -64,6 +64,6 @@ def setup(app):
app.connect('builder-inited', generate_redirects) app.connect('builder-inited', generate_redirects)
return { return {
'parallel_read_safe': False, 'parallel_read_safe': True,
'parallel_write_safe': True 'parallel_write_safe': True
} }

2
extensions/switcher/__init__.py
View File

@ -13,7 +13,7 @@ def setup(app):
app.connect('env-updated', add_statics) app.connect('env-updated', add_statics)
return { return {
'parallel_read_safe': False, 'parallel_read_safe': True,
'parallel_write_safe': True 'parallel_write_safe': True
} }