[IMP] conf.py, requirements.txt, *: allow building with Python 3.10
- Bump Sphinx version to 4.3.2 (default for Debian Jammy). - Remove the retrocompatibility for Sphinx < 3.5 (warnings are raised in 4.5). - Fix translator issue crashing builds. - Unpin jinja2 from the requirements as the base issue is solved in sphinx 4 Task - 2898477 Part-of: odoo/documentation#2455
This commit is contained in:
parent
449898e39c
commit
fb149f3cb3
4
conf.py
4
conf.py
@ -232,8 +232,8 @@ html_favicon = os.path.join(html_theme_path[0], html_theme, 'static', 'img', 'fa
|
||||
# They are copied after the builtin static files, so a file named "default.css" will overwrite the
|
||||
# builtin "default.css".
|
||||
html_static_path = ['static']
|
||||
html_add_permalinks = '¶' # Sphinx < 3.5
|
||||
html_permalinks = True # Sphinx >= 3.5
|
||||
html_permalinks = True
|
||||
|
||||
# Additional JS & CSS files that can be imported with the 'custom-js' and 'custom-css' metadata.
|
||||
# Lists are empty because the files are specified in extensions/themes.
|
||||
html_js_files = []
|
||||
|
@ -114,11 +114,11 @@ class FieldDocumenter(AttributeDocumenter):
|
||||
self.add_line(line, source_name)
|
||||
self.add_line('', source_name)
|
||||
|
||||
def get_doc(self, encoding=None, ignore=None):
|
||||
def get_doc(self, *args, **kwargs):
|
||||
# only read docstring of field instance, do not fallback on field class
|
||||
field = self.object
|
||||
field.__doc__ = field.__dict__.get('__doc__', "")
|
||||
res = super().get_doc(encoding, ignore)
|
||||
res = super().get_doc(*args, **kwargs)
|
||||
return res
|
||||
|
||||
|
||||
|
@ -1,13 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import os.path
|
||||
import posixpath
|
||||
import re
|
||||
|
||||
from docutils import nodes
|
||||
from sphinx import addnodes, util, builders
|
||||
from sphinx.locale import admonitionlabels
|
||||
from sphinx.writers.html5 import HTML5Translator
|
||||
#from urllib.request import url2pathname
|
||||
|
||||
|
||||
# Translators inheritance chain:
|
||||
# Docutils Base HTML translator: https://sourceforge.net/p/docutils/code/HEAD/tree/trunk/docutils/docutils/writers/_html_base.py
|
||||
@ -56,7 +52,6 @@ class BootstrapTranslator(HTML5Translator):
|
||||
html_title = 'html_title'
|
||||
html_subtitle = 'html_subtitle'
|
||||
|
||||
|
||||
def __init__(self, builder, *args, **kwds):
|
||||
super().__init__(builder, *args, **kwds)
|
||||
|
||||
@ -150,7 +145,8 @@ class BootstrapTranslator(HTML5Translator):
|
||||
# type: (nodes.Node) -> None
|
||||
self.generate_targets_for_table(node)
|
||||
|
||||
self._table_row_index = 0
|
||||
# c/p of https://github.com/pydata/pydata-sphinx-theme/pull/509/files
|
||||
self._table_row_indices.append(0)
|
||||
|
||||
classes = [cls.strip(u' \t\n')
|
||||
for cls in self.settings.table_style.split(',')]
|
||||
|
@ -1,8 +1,6 @@
|
||||
docutils==0.16.0 # Compatibility with sphinx-tabs 3.2.0.
|
||||
jinja2<3.1 # Compatibility with Sphinx 3.5.4.
|
||||
libsass==0.18.0
|
||||
pygments~=2.6.1
|
||||
pygments-csv-lexer~=0.1
|
||||
sphinx~=3.0
|
||||
sphinx==4.3.2
|
||||
sphinx-tabs==3.2.0
|
||||
werkzeug==0.14.1
|
||||
|
Loading…
Reference in New Issue
Block a user