IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.x'

Browse Source
This commit is contained in:
Takeshi KOMIYA 2022-07-23 15:32:38 +09:00
commit 1199f7bd75
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindep.txt
View File

@ -13,6 +13,7 @@ texlive-anyfontsize [platform:rpm]
texlive-ctablestack [platform:rpm] texlive-ctablestack [platform:rpm]
texlive-gnu-freefont [platform:rpm] texlive-gnu-freefont [platform:rpm]
texlive-tex-gyre [platform:rpm] texlive-tex-gyre [platform:rpm]
texlive-pict2e [platform:rpm]
latexmk [platform:rpm] latexmk [platform:rpm]
texlive-latex-recommended [platform:dpkg] texlive-latex-recommended [platform:dpkg]
@ -20,4 +21,5 @@ texlive-fonts-recommended [platform:dpkg]
tex-gyre [platform:dpkg] tex-gyre [platform:dpkg]
texlive-latex-extra [platform:dpkg] texlive-latex-extra [platform:dpkg]
texlive-luatex [platform:dpkg] texlive-luatex [platform:dpkg]
texlive-pictures [platform:dpkg]
latexmk [platform:dpkg] latexmk [platform:dpkg]

2
doc/usage/configuration.rst
View File

@ -723,7 +723,7 @@ General configuration
This was the behaviour before version 3.0, and setting this variable to This was the behaviour before version 3.0, and setting this variable to
``True`` will reinstate that behaviour. ``True`` will reinstate that behaviour.
.. versionadded:: 3.0 .. versionadded:: 3.0
.. confval:: option_emphasise_placeholders .. confval:: option_emphasise_placeholders

4
doc/usage/extensions/autosummary.rst
View File

@ -323,9 +323,9 @@ The following variables are available in the templates:
List containing names of "public" attributes in the class/module. Only List containing names of "public" attributes in the class/module. Only
available for classes and modules. available for classes and modules.
.. versionchanged:: 3.1 .. versionchanged:: 3.1
Attributes of modules are supported. Attributes of modules are supported.
.. data:: modules .. data:: modules

2
setup.py
View File

@ -43,7 +43,7 @@ extras_require = {
'flake8-comprehensions', 'flake8-comprehensions',
'flake8-bugbear', 'flake8-bugbear',
'isort', 'isort',
'mypy>=0.950', 'mypy>=0.971',
'sphinx-lint', 'sphinx-lint',
'docutils-stubs', 'docutils-stubs',
"types-typed-ast", "types-typed-ast",

4
sphinx/util/logging.py
View File

@ -78,7 +78,7 @@ def convert_serializable(records: List[logging.LogRecord]) -> None:
location = getattr(r, 'location', None) location = getattr(r, 'location', None)
if isinstance(location, nodes.Node): if isinstance(location, nodes.Node):
r.location = get_node_location(location) # type: ignore r.location = get_node_location(location)
class SphinxLogRecord(logging.LogRecord): class SphinxLogRecord(logging.LogRecord):
@ -432,7 +432,7 @@ class DisableWarningIsErrorFilter(logging.Filter):
"""Disable WarningIsErrorFilter if this filter installed.""" """Disable WarningIsErrorFilter if this filter installed."""
def filter(self, record: logging.LogRecord) -> bool: def filter(self, record: logging.LogRecord) -> bool:
record.skip_warningsiserror = True # type: ignore record.skip_warningsiserror = True
return True return True