Merging upstream version 7.4.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 35 insertions, 4 deletions

diff --git a/tests/roots/test-ext-autodoc/conf.py b/tests/roots/test-ext-autodoc/conf.py
index 979a709..9d1cdc7 100644
--- a/tests/roots/test-ext-autodoc/conf.py
+++ b/tests/roots/test-ext-autodoc/conf.py
@@ -5,9 +5,6 @@ sys.path.insert(0, os.path.abspath('.'))
 
 extensions = ['sphinx.ext.autodoc']
 
-# The suffix of source filenames.
-source_suffix = '.rst'
-
 autodoc_mock_imports = [
     'dummy'
 ]
diff --git a/tests/roots/test-ext-autodoc/target/annotated.py b/tests/roots/test-ext-autodoc/target/annotated.py
index 5b87518..7adc3e0 100644
--- a/tests/roots/test-ext-autodoc/target/annotated.py
+++ b/tests/roots/test-ext-autodoc/target/annotated.py
@@ -1,8 +1,42 @@
-from __future__ import annotations
+# from __future__ import annotations
 
+import dataclasses
+import types
 from typing import Annotated
 
 
+@dataclasses.dataclass(frozen=True)
+class FuncValidator:
+    func: types.FunctionType
+
+
+@dataclasses.dataclass(frozen=True)
+class MaxLen:
+    max_length: int
+    whitelisted_words: list[str]
+
+
+def validate(value: str) -> str:
+    return value
+
+
+#: Type alias for a validated string.
+ValidatedString = Annotated[str, FuncValidator(validate)]
+
+
 def hello(name: Annotated[str, "attribute"]) -> None:
     """docstring"""
     pass
+
+
+class AnnotatedAttributes:
+    """docstring"""
+
+    #: Docstring about the ``name`` attribute.
+    name: Annotated[str, "attribute"]
+
+    #: Docstring about the ``max_len`` attribute.
+    max_len: list[Annotated[str, MaxLen(10, ['word_one', 'word_two'])]]
+
+    #: Docstring about the ``validated`` attribute.
+    validated: ValidatedString