Retarget to Sphinx 9.0

Author: AA-Turner

CHANGES.rst

@@ -1,4 +1,4 @@
-Release 8.3.0 (in development)
+Release 9.0.0 (in development)
 ==============================
 
 Dependencies
@@ -18,7 +18,7 @@ Incompatible changes
   and there may be some incompatible changes in edge cases, especially when
   extensions interact with autodoc internals.
   The :confval:`autodoc_use_legacy_class_based` option has been added to
-  use the legacy (pre-8.3) implementation of autodoc.
+  use the legacy (pre-9.0) implementation of autodoc.
   Patches by Adam Turner.
 
 Deprecated

doc/extdev/deprecated.rst

@@ -23,33 +23,33 @@ The following is a list of deprecated interfaces.
      - Alternatives
 
    * - ``sphinx.io`` (entire module)
-     - 8.3
-     - 10.0
+     - 9.0
+     - 11.0
      - ``docutils.io`` or standard Python I/O
 
    * - ``sphinx.builders.Builder.app``
-     - 8.3
-     - 10.0
+     - 9.0
+     - 11.0
      - N/A
 
    * - ``sphinx.environment.BuildEnvironment.app``
-     - 8.3
-     - 10.0
+     - 9.0
+     - 11.0
      - N/A
 
    * - ``sphinx.transforms.Transform.app``
-     - 8.3
-     - 10.0
+     - 9.0
+     - 11.0
      - N/A
 
    * - ``sphinx.transforms.post_transforms.SphinxPostTransform.app``
-     - 8.3
-     - 10.0
+     - 9.0
+     - 11.0
      - N/A
 
    * - ``sphinx.events.EventManager.app``
-     - 8.3
-     - 10.0
+     - 9.0
+     - 11.0
      - N/A
 
    * - ``sphinx.builders.singlehtml.SingleFileHTMLBuilder.fix_refuris``

doc/man/sphinx-build.rst

@@ -285,7 +285,7 @@ Options
       The option is retained for compatibility, but may be removed at some
       later date.
 
-   .. xref RemovedInSphinx10Warning: deprecate this option in Sphinx 10
+   .. xref RemovedInSphinx11Warning: deprecate this option in Sphinx 10
                                      or no earlier than 2026-01-01.
 
 .. option:: -T, --show-traceback

doc/usage/configuration.rst

@@ -1157,9 +1157,9 @@ Options for source files
    The recommended encoding is ``'utf-8-sig'``.
 
    .. versionadded:: 0.5
-   .. deprecated:: 8.3
+   .. deprecated:: 9.0
       Support for source encodings other than UTF-8 is deprecated.
-      Sphinx 10 will only support UTF-8 files.
+      Sphinx 11 will only support UTF-8 files.
 
 .. confval:: source_suffix
    :type: :code-py:`dict[str, str] | Sequence[str] | str`
@@ -3671,7 +3671,7 @@ and which failures and redirects it ignores.
 
    .. versionadded:: 4.1
 
-   .. versionchanged:: 8.3
+   .. versionchanged:: 9.0
       Setting :confval:`!linkcheck_allowed_redirects` to an empty dictionary
       may now be used to warn on all redirects encountered
       by the *linkcheck* builder.
@@ -3847,7 +3847,7 @@ and the number of workers to use.
    .. note:: URI fragments (HTML anchors) are not affected by this option.
              They are always checked with case-sensitive comparisons.
 
-   .. versionadded:: 8.3
+   .. versionadded:: 9.0
 
 .. confval:: linkcheck_rate_limit_timeout
    :type: :code-py:`int`

doc/usage/extensions/autodoc.rst

@@ -971,7 +971,7 @@ Automatically document type aliases
 
 .. rst:directive:: autotype
 
-   .. versionadded:: 8.3
+   .. versionadded:: 9.0
 
    Document a :pep:`695` type alias (the :keyword:`type` statement).
    By default, the directive only inserts the docstring of the alias itself:
@@ -1008,7 +1008,7 @@ There are also config values that you can set:
    :default: :code-py:`False`
 
    If true, autodoc will use the legacy class-based implementation.
-   This is the behaviour prior to Sphinx 8.3.
+   This is the behaviour prior to Sphinx 9.0.
    It is based on the ``Documenter`` class hierarchy.
 
    This setting is provided for backwards compatibility if your documentation
@@ -1335,7 +1335,7 @@ There are also config values that you can set:
       which defaults to :code-py:`True` for backwards compatibility.
       The default will change to :code-py:`False` in Sphinx 10.
 
-      .. xref RemovedInSphinx10Warning
+      .. xref RemovedInSphinx11Warning
 
 .. confval:: autodoc_warningiserror
    :type: :code-py:`bool`

doc/usage/extensions/doctest.rst

@@ -459,4 +459,4 @@ The doctest extension uses the following configuration values:
 
    Exit when the first failure is encountered.
 
-   .. versionadded:: 8.3
+   .. versionadded:: 9.0

doc/usage/extensions/math.rst

@@ -346,7 +346,7 @@ Sphinx but is set to automatically include it from a third-party site.
 
    __ https://docs.mathjax.org/en/latest/web/configuration.html#configuration
 
-   .. versionadded:: 8.3
+   .. versionadded:: 9.0
 
 :mod:`sphinxcontrib.jsmath` -- Render math via JavaScript
 ---------------------------------------------------------

doc/usage/restructuredtext/directives.rst

@@ -552,7 +552,7 @@ Describing changes between versions
       There must be no blank line between the directive head and the explanation;
       this is to make these blocks visually continuous in the markup.
 
-   .. version-changed:: 8.3
+   .. version-changed:: 9.0
       The :rst:dir:`versionadded` directive was renamed to :rst:dir:`version-added`.
       The previous name is retained as an alias.
 
@@ -570,7 +570,7 @@ Describing changes between versions
    Similar to :rst:dir:`version-added`, but describes when and what changed in
    the named feature in some way (new parameters, changed side effects, etc.).
 
-   .. version-changed:: 8.3
+   .. version-changed:: 9.0
       The :rst:dir:`versionchanged` directive was renamed to :rst:dir:`version-changed`.
       The previous name is retained as an alias.
 
@@ -590,7 +590,7 @@ Describing changes between versions
    A *brief* explanation can also be given,
    for example to tell the reader what to use instead.
 
-   .. version-changed:: 8.3
+   .. version-changed:: 9.0
       The :rst:dir:`deprecated` directive was renamed to :rst:dir:`version-deprecated`.
       The previous name is retained as an alias
 
@@ -611,7 +611,7 @@ Describing changes between versions
 
    .. version-added:: 7.3
 
-   .. version-changed:: 8.3
+   .. version-changed:: 9.0
       The :rst:dir:`versionremoved` directive was renamed to :rst:dir:`version-removed`.
       The previous name is retained as an alias.
 
@@ -1492,7 +1492,7 @@ Check the :confval:`latex_table_style`.
    complex contents such as multiple paragraphs, blockquotes, lists, literal
    blocks, will render correctly to LaTeX output.
 
-.. versionchanged:: 8.3.0
+.. versionchanged:: 9.0
    The partial support of the LaTeX builder for nesting a table in another
    has been extended.
    Formerly Sphinx would raise an error if ``longtable`` class was specified
@@ -1579,12 +1579,12 @@ Check the :confval:`latex_table_style`.
    preamble, as in fact Sphinx uses ``T`` and sets it by default to be an
    alias of ``J``.
 
-.. versionchanged:: 8.3.0
+.. versionchanged:: 9.0
 
    Formerly, Sphinx did not use ``tabulary`` if the table had at least one
    cell containing "problematic" elements such as lists, object descriptions,
    blockquotes (etc...) because such contents are not out-of-the-box
-   compatible with ``tabulary``.  At ``8.3.0`` a technique, which was already
+   compatible with ``tabulary``.  At ``9.0`` a technique, which was already
    in use for merged cells, was extended to such cases, and the sole
    "problematic" contents are code-blocks and nested tables.  So tables
    containing (only) cells with multiple paragraphs, bullet or enumerated

sphinx/__init__.py

@@ -11,7 +11,7 @@
 if TYPE_CHECKING:
     from typing import Final
 
-__version__: Final = '8.3.0'
+__version__: Final = '9.0.0'
 __display_version__: Final = __version__  # used for command line version
 
 #: Version info for better programmatic use.
@@ -22,7 +22,7 @@
 #:
 #: .. versionadded:: 1.2
 #:    Before version 1.2, check the string ``sphinx.__version__``.
-version_info: Final = (8, 3, 0, 'beta', 0)
+version_info: Final = (9, 0, 0, 'beta', 0)
 
 package_dir: Final = _StrPath(__file__).resolve().parent
 del _StrPath

sphinx/builders/__init__.py

@@ -642,7 +642,7 @@ def read_doc(self, docname: str, *, _cache: bool = True) -> None:
         filename = env.doc2path(docname)
 
         # set up error_handler for the target document
-        # xref RemovedInSphinx90Warning
+        # xref RemovedInSphinx10Warning
         error_handler = _UnicodeDecodeErrorHandler(docname)
         codecs.register_error('sphinx', error_handler)  # type: ignore[arg-type]
 
@@ -914,7 +914,7 @@ def __call__(self, error: UnicodeDecodeError) -> tuple[str, int]:
             __(
                 "undecodable source characters, replacing with '?': '%s>>>%s<<<%s'. "
                 'This will become an error in Sphinx 9.0.'
-                # xref RemovedInSphinx90Warning
+                # xref RemovedInSphinx10Warning
             ),
             obj[line_start + 1 : error.start].decode(errors='backslashreplace'),
             obj[error.start : error.end].decode(errors='backslashreplace'),