Merge remote-tracking branch 'upstream/main' into codex/pr-2277-merge-main

# Conflicts:
#	conformance/results/results.html

Author: JelleZijlstra

.gitattributes

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

.github/workflows/build-docs.yml

@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Set up Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v7
       with:
-        python-version: 3.9
+        python-version: "3.14"
     - name: Install dependencies
       run: |
         pip install --upgrade pip
-        pip install -r docs/requirements.txt
+        pip install --group docs
     - name: Build the documentation
       run: make -C docs html

.github/workflows/ci.yml

@@ -14,18 +14,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
-      - name: Set up Python 3
-        uses: actions/setup-python@v6
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v7
         with:
-          python-version: 3
+          python-version: "3.14"
           cache: "pip"
-          cache-dependency-path: "test-requirements.txt"
 
       - name: Install dependencies
         run: |
           pip install --upgrade pip
-          pip install -r test-requirements.txt
+          pip install --group test
 
       - name: Lint implementation
         run: flake8

.github/workflows/conformance.yml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Set up Python 3.12
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: "3.12"
           cache: "pip"

.readthedocs.yaml

@@ -4,13 +4,17 @@
 version: 2
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-26.04
   tools:
     python: "3"
+  jobs:
+    install:
+      - uv sync --group docs
 
 sphinx:
   configuration: docs/conf.py
 
 python:
   install:
-  - requirements: docs/requirements.txt
+    - method: uv
+      command: sync

conformance/pyproject.toml

@@ -3,14 +3,16 @@ name = "typing-conformance"
 version = "0.1.0"
 requires-python = "==3.12.*"
 dependencies = [
+    "jinja2",
+    "markdown",
     "mypy",
     "pycroscope",
-    "pyrefly",
+    "pyrefly==1.3.0.dev1",
     "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 = """
@@ -22,7 +22,7 @@ annotations_forward_refs.py:53: error: Invalid type comment or annotation  [vali
 annotations_forward_refs.py:54: error: Invalid type comment or annotation  [valid-type]
 annotations_forward_refs.py:55: error: Module "types" is not valid as a type  [valid-type]
 annotations_forward_refs.py:55: note: Perhaps you meant to use a protocol matching the module structure?
-annotations_forward_refs.py:80: error: Name "ClassF" is not defined  [name-defined]
+annotations_forward_refs.py:80: error: Name "ClassF" is not defined; did you mean "ClassA", "ClassB", or "ClassC"?  [name-defined]
 annotations_forward_refs.py:87: error: Function "annotations_forward_refs.ClassD.int" is not valid as a type  [valid-type]
 annotations_forward_refs.py:87: note: Perhaps you need "Callable[...]" or a callback protocol?
 annotations_forward_refs.py:89: error: Function "annotations_forward_refs.ClassD.int" is not valid as a type  [valid-type]

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]