Merge branch '5.x'

bindep.txt

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

doc/usage/configuration.rst

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

doc/usage/extensions/autosummary.rst

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

setup.py

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

sphinx/util/logging.py

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