Merge upstream/main: resolve TOML notes conflicts, regenerate results.html

Author: ashishpatel26

.gitattributes

@@ -0,0 +1 @@
+conformance/results/results.html linguist-generated

conformance/pyproject.toml

@@ -3,14 +3,16 @@ name = "typing-conformance"
 version = "0.1.0"
 requires-python = "==3.12.*"
 dependencies = [
+    "jinja2",
+    "markdown",
     "mypy",
     "pycroscope",
     "pyrefly",
     "pyright",
-    "tomli",
     "tomlkit",
-    "zuban",
     "ty",
+    "types-markdown",
+    "zuban",
 ]
 
 [tool.uv]

conformance/results/mypy/aliases_typealiastype.toml

@@ -1,7 +1,7 @@
 conformant = "Partial"
 notes = """
-Incorrectly rejects some recursive type aliases using TypeAliasType.
-Incorrectly rejects the use of a class-scoped TypeVar in a TypeAliasType definition.
+Incorrectly rejects some recursive type aliases using `TypeAliasType`.
+Incorrectly rejects the use of a class-scoped `TypeVar` in a `TypeAliasType` definition.
 """
 output = """
 aliases_typealiastype.py:20: error: Cannot resolve name "GoodAlias5" (possible cyclic definition)  [misc]

conformance/results/mypy/annotations_forward_refs.toml

@@ -1,7 +1,7 @@
 conformant = "Partial"
 notes = """
 Does not report error for a forward reference that is not enclosed in quotes.
-Does not report error for use of quoted type with "|" operator (runtime error).
+Does not report error for use of quoted type with `|` operator (runtime error).
 Incorrectly generates error for quoted type defined in class scope.
 """
 output = """

conformance/results/mypy/annotations_generators.toml

@@ -1,6 +1,6 @@
 conformant = "Partial"
 notes = """
-Does not report incompatible Generator type in `yield from` statement.
+Does not report incompatible `Generator` type in `yield from` statement.
 """
 output = """
 annotations_generators.py:51: error: Missing return statement  [return]

conformance/results/mypy/callables_annotation.toml

@@ -1,7 +1,7 @@
 conformant = "Partial"
 notes = """
-Incorrectly treats "*args: T, **kwargs: T" as "..." when T is specialized to Any.
-Does not treat "*args: Any, **kargs: Any" as "..." when separated by keyword parameter.
+Incorrectly treats `*args: T, **kwargs: T` as `...` when `T` is specialized to `Any`.
+Does not treat `*args: Any, **kargs: Any` as `...` when separated by keyword parameter.
 """
 output = """
 callables_annotation.py:25: error: Too few arguments  [call-arg]

conformance/results/mypy/callables_kwargs.toml

@@ -1,6 +1,6 @@
 conformant = "Partial"
 notes = """
-Allows callable without kwargs to be assigned to callable with unpacked kwargs
+Allows callable without kwargs to be assigned to callable with unpacked kwargs.
 """
 output = """
 callables_kwargs.py:46: error: Missing named argument "v1" for "func1"  [call-arg]

conformance/results/mypy/classes_classvar.toml

@@ -1,9 +1,9 @@
 conformant = "Partial"
 notes = """
-Internal error if TypeVarTuple is used in ClassVar.
-Does not reject use of ParamSpec in ClassVar.
-Rejects ClassVar nested in Annotated.
-Does not reject use of ClassVar in TypeAlias definition.
+Internal error if `TypeVarTuple` is used in `ClassVar`.
+Does not reject use of `ParamSpec` in `ClassVar`.
+Rejects `ClassVar` nested in `Annotated`.
+Does not reject use of `ClassVar` in `TypeAlias` definition.
 """
 output = """
 classes_classvar.py:38: error: ClassVar[...] must have at most one type argument  [valid-type]

conformance/results/mypy/constructors_call_init.toml

@@ -1,7 +1,7 @@
 conformant = "Partial"
 notes = """
-Does not report errors during binding to self parameter of __init__ method.
-Does not reject use of class-scoped type variables in annotation of self parameter in __init__ method.
+Does not report errors during binding to self parameter of `__init__` method.
+Does not reject use of class-scoped type variables in annotation of self parameter in `__init__` method.
 """
 conformance_automated = "Fail"
 errors_diff = """

conformance/results/mypy/constructors_call_metaclass.toml

@@ -1,7 +1,7 @@
 conformant = "Unsupported"
 notes = """
-Does not honor metaclass __call__ method when evaluating constructor call.
-Does not skip evaluation of __new__ and __init__ if custom metaclass call returns non-class.
+Does not honor metaclass `__call__` method when evaluating constructor call.
+Does not skip evaluation of `__new__` and `__init__` if custom metaclass call returns non-class.
 """
 conformance_automated = "Fail"
 errors_diff = """