Merge pull request #3384 from A5rocks/update-sphinx

Update to Sphinx 9

Author: A5rocks

docs-requirements.in

@@ -1,6 +1,6 @@
 # RTD is currently installing 1.5.3, which has a bug in :lineno-match: (??)
-# sphinx 5.3 doesn't work with our _NoValue workaround, 9.0 breaks sphinxcontrib-trio
-sphinx >= 6.0,<9.0
+# sphinx 5.3 doesn't work with our _NoValue workaround
+sphinx >= 6.0
 jinja2
 # >= is necessary to prevent `uv` from selecting a `Sphinx` version this does not support
 sphinx_rtd_theme >= 3

docs-requirements.txt

@@ -26,7 +26,7 @@ colorama==0.4.6 ; sys_platform == 'win32'
     #   sphinx
 cryptography==46.0.4
     # via pyopenssl
-docutils==0.21.2
+docutils==0.22.4
     # via
     #   sphinx
     #   sphinx-rtd-theme
@@ -60,8 +60,6 @@ pyopenssl==25.3.0
 requests==2.32.5
     # via sphinx
 roman-numerals==4.1.0
-    # via roman-numerals-py
-roman-numerals-py==4.1.0
     # via sphinx
 sniffio==1.3.1
     # via -r docs-requirements.in
@@ -71,7 +69,14 @@ sortedcontainers==2.4.0
     # via -r docs-requirements.in
 soupsieve==2.8.3
     # via beautifulsoup4
-sphinx==8.2.3
+sphinx==9.0.4 ; python_full_version < '3.12'
+    # via
+    #   -r docs-requirements.in
+    #   sphinx-codeautolink
+    #   sphinx-rtd-theme
+    #   sphinxcontrib-jquery
+    #   sphinxcontrib-trio
+sphinx==9.1.0 ; python_full_version >= '3.12'
     # via
     #   -r docs-requirements.in
     #   sphinx-codeautolink

src/trio/_core/_generated_run.py

@@ -12,7 +12,7 @@
     import contextvars
     from collections.abc import Awaitable, Callable
 
-    from outcome import Outcome
+    import outcome
     from typing_extensions import Unpack
 
     from .._abc import Clock
@@ -102,7 +102,7 @@ def current_root_task() -> Task | None:
 
 
 @enable_ki_protection
-def reschedule(task: Task, next_send: Outcome[object] = _NO_SEND) -> None:
+def reschedule(task: Task, next_send: outcome.Outcome[object] = _NO_SEND) -> None:
     """Reschedule the given task with the given
     :class:`outcome.Outcome`.
 

src/trio/_core/_run.py

@@ -25,6 +25,7 @@
 )
 
 import attrs
+import outcome
 from outcome import Error, Outcome, Value, capture
 from sniffio import thread_local as sniffio_library
 from sortedcontainers import SortedDict
@@ -1903,7 +1904,9 @@ def current_root_task(self) -> Task | None:
     ################
 
     @_public
-    def reschedule(self, task: Task, next_send: Outcome[object] = _NO_SEND) -> None:
+    def reschedule(
+        self, task: Task, next_send: outcome.Outcome[object] = _NO_SEND
+    ) -> None:
         """Reschedule the given task with the given
         :class:`outcome.Outcome`.
 

src/trio/_tools/gen_exports.py

@@ -348,7 +348,7 @@ def main() -> None:  # pragma: no cover
 from collections.abc import Awaitable, Callable
 from typing import Any, TYPE_CHECKING
 
-from outcome import Outcome
+import outcome
 import contextvars
 
 from ._run import _NO_SEND, RunStatistics, Task