Merge branch 'master' into c-domain-entries

Author: AA-Turner

doc/man/sphinx-build.rst

@@ -272,13 +272,13 @@ Options
    From Sphinx 8.1, :option:`!--keep-going` is always enabled.
    Previously, it was only applicable whilst using :option:`--fail-on-warning`,
    which by default exited :program:`sphinx-build` on the first warning.
-   Using :option:`!--keep-going` runs :program:`!sphinx-build` to completion
+   Using :option:`!--keep-going` runs :program:`sphinx-build` to completion
    and exits with exit status 1 if errors are encountered.
 
    .. versionadded:: 1.8
    .. versionchanged:: 8.1
       :program:`sphinx-build` no longer exits on the first warning,
-      meaning that in effect :option:`!--fail-on-warning` is always enabled.
+      meaning that in effect :option:`!--keep-going` is always enabled.
       The option is retained for compatibility, but may be removed at some
       later date.
 

pyproject.toml

@@ -92,7 +92,7 @@ docs = [
     "sphinxcontrib-websupport",
 ]
 lint = [
-    "ruff==0.11.7",
+    "ruff==0.11.9",
     "mypy==1.15.0",
     "sphinx-lint>=0.9",
     "types-colorama==0.4.15.20240311",
@@ -135,7 +135,7 @@ docs = [
     "sphinxcontrib-websupport",
 ]
 lint = [
-    "ruff==0.11.7",
+    "ruff==0.11.9",
     "sphinx-lint>=0.9",
 ]
 package = [
@@ -290,7 +290,6 @@ module = [
     "tests.test_util.test_util",
     "tests.test_util.test_util_display",
     "tests.test_util.test_util_docutils",
-    "tests.test_util.test_util_images",
     "tests.test_util.test_util_inventory",
     # tests/test_writers
     "tests.test_writers.test_docutilsconf",

tests/roots/test-ext-autodoc/target/need_mocks.py

@@ -1,10 +1,9 @@
 import missing_module
 import missing_package1.missing_module1
+import sphinx.missing_module4
 from missing_module import missing_name
 from missing_package2 import missing_module2
 from missing_package3.missing_module3 import missing_name  # NoQA: F811
-
-import sphinx.missing_module4
 from sphinx.missing_module4 import missing_name2
 
 

tests/test_builders/test_build_linkcheck.py

@@ -1127,6 +1127,12 @@ def test_too_many_requests_retry_after_HTTP_date(tz, app, monkeypatch, capsys):
         ) as address:
             app.build()
 
+    # Undo side-effects: the monkeypatch context manager clears the TZ environment
+    # variable, but we also need to reset Python's internal notion of the current
+    # timezone.
+    if sys.platform != 'win32':
+        time.tzset()
+
     content = (app.outdir / 'output.json').read_text(encoding='utf8')
     assert json.loads(content) == {
         'filename': 'index.rst',

tests/test_extensions/test_ext_autodoc.py

@@ -938,10 +938,14 @@ def test_autodoc_special_members(app):
     }
     if sys.version_info >= (3, 13, 0, 'alpha', 5):
         options['exclude-members'] = '__static_attributes__,__firstlineno__'
+    if sys.version_info >= (3, 14, 0, 'alpha', 7):
+        ann_attr_name = '__annotations_cache__'
+    else:
+        ann_attr_name = '__annotations__'
     actual = do_autodoc(app, 'class', 'target.Class', options)
     assert list(filter(lambda l: '::' in l, actual)) == [
         '.. py:class:: Class(arg)',
-        '   .. py:attribute:: Class.__annotations__',
+        f'   .. py:attribute:: Class.{ann_attr_name}',
         '   .. py:attribute:: Class.__dict__',
         '   .. py:method:: Class.__init__(arg)',
         '   .. py:attribute:: Class.__module__',

tests/test_extensions/test_ext_autodoc_configs.py

@@ -1348,6 +1348,11 @@ def test_autodoc_type_aliases(app: SphinxTestApp) -> None:
     # default
     options = {'members': None}
     actual = do_autodoc(app, 'module', 'target.autodoc_type_aliases', options)
+    attr2_typeinfo: tuple[str, ...]
+    if sys.version_info >= (3, 14, 0, 'alpha', 7):
+        attr2_typeinfo = ()
+    else:
+        attr2_typeinfo = ('      :type: int',)
     assert list(actual) == [
         '',
         '.. py:module:: target.autodoc_type_aliases',
@@ -1368,7 +1373,7 @@ def test_autodoc_type_aliases(app: SphinxTestApp) -> None:
         '',
         '   .. py:attribute:: Foo.attr2',
         '      :module: target.autodoc_type_aliases',
-        '      :type: int',
+        *attr2_typeinfo,
         '',
         '      docstring',
         '',
@@ -1421,6 +1426,10 @@ def test_autodoc_type_aliases(app: SphinxTestApp) -> None:
         'io.StringIO': 'my.module.StringIO',
     }
     actual = do_autodoc(app, 'module', 'target.autodoc_type_aliases', options)
+    if sys.version_info >= (3, 14, 0, 'alpha', 7):
+        attr2_typeinfo = ()
+    else:
+        attr2_typeinfo = ('      :type: myint',)
     assert list(actual) == [
         '',
         '.. py:module:: target.autodoc_type_aliases',
@@ -1441,7 +1450,7 @@ def test_autodoc_type_aliases(app: SphinxTestApp) -> None:
         '',
         '   .. py:attribute:: Foo.attr2',
         '      :module: target.autodoc_type_aliases',
-        '      :type: myint',
+        *attr2_typeinfo,
         '',
         '      docstring',
         '',

tests/test_util/test_util_images.py

@@ -11,13 +11,17 @@
     parse_data_uri,
 )
 
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from pathlib import Path
+
 GIF_FILENAME = 'img.gif'
 PNG_FILENAME = 'img.png'
 PDF_FILENAME = 'img.pdf'
 TXT_FILENAME = 'index.txt'
 
 
-def test_get_image_size(rootdir):
+def test_get_image_size(rootdir: Path) -> None:
     assert get_image_size(rootdir / 'test-root' / GIF_FILENAME) == (200, 181)
     assert get_image_size(rootdir / 'test-root' / PNG_FILENAME) == (200, 181)
     assert get_image_size(rootdir / 'test-root' / PDF_FILENAME) is None