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

# Conflicts:
#	conformance/results/mypy/version.toml
#	conformance/results/pyre/generics_type_erasure.toml
#	conformance/results/pyre/version.toml
#	conformance/results/pytype/generics_type_erasure.toml
#	conformance/results/pytype/version.toml
#	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@v4
+    - uses: actions/checkout@v7
     - name: Set up Python
-      uses: actions/setup-python@v5
+      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@v4
-      - name: Set up Python 3
-        uses: actions/setup-python@v5
+      - 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

@@ -0,0 +1,47 @@
+name: Conformance
+
+on:
+  push:
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  conformance:
+    name: Run conformance suite
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v7
+
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v7
+        with:
+          python-version: "3.12"
+          cache: "pip"
+
+      - name: Install uv
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install uv
+
+      - name: Run conformance suite
+        working-directory: conformance
+        run: |
+          uv sync --python 3.12 --frozen
+          uv run --python 3.12 --frozen python src/main.py
+
+      - name: Validate conformance invariants
+        working-directory: conformance
+        run: |
+          uv run --python 3.12 --frozen python src/validate_results.py
+
+      - name: Assert conformance results are up to date
+        run: |
+          if [ -n "$(git status --porcelain -- conformance/results)" ]; then
+            git status --short conformance/results
+            git diff -- conformance/results
+            echo "Conformance results are out of date. Run conformance/src/main.py and commit updated results."
+            exit 1
+          fi

.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

README.md

@@ -14,7 +14,7 @@ repository.
 For conversations that are more suitable to a chat platform, you can use one of the following:
 
 - [gitter](https://gitter.im/python/typing)
-- [discord](https://discord.com/channels/267624335836053506/891788761371906108) `#type-hinting` channel
+- [discord](https://discord.com/invite/python) [#type-hinting](https://discord.com/channels/267624335836053506/891788761371906108) channel
 
 ## Repository Content
 

conformance/.gitignore

@@ -32,8 +32,6 @@ MANIFEST
 
 # Tools
 .mypy_cache
-.pyre_configuration
-.pyre
 .coverage
 htmlcov
 

conformance/README.md

@@ -12,6 +12,7 @@ This project contains test cases for behaviors defined in the Python typing spec
 
 * [concepts](https://typing.python.org/en/latest/spec/concepts.html)
 * [annotations](https://typing.python.org/en/latest/spec/annotations.html)
+* [typeforms](https://typing.python.org/en/latest/spec/type-forms.html)
 * [specialtypes](https://typing.python.org/en/latest/spec/special-types.html)
 * [generics](https://typing.python.org/en/latest/spec/generics.html)
 * [qualifiers](https://typing.python.org/en/latest/spec/qualifiers.html)
@@ -70,18 +71,17 @@ by the scoring system.
 
 To run the conformance test suite:
 * Clone the https://github.com/python/typing repo.
-* Create and activate a Python 3.12 virtual environment.
-* Switch to the `conformance` subdirectory and install all dependencies (`pip install -r requirements.txt`).
-* Switch to the `src` subdirectory and run `python main.py`.
+* Install [uv](https://docs.astral.sh/uv/) and ensure Python 3.12 is available.
+* Switch to the `conformance` subdirectory and install locked dependencies (`uv sync --python 3.12 --frozen`).
+* Run the conformance tool (`uv run --python 3.12 --frozen python src/main.py`).
 
 Note that some type checkers may not run on some platforms. If a type checker fails to install, tests will be skipped for that type checker.
-Currently, the only unsupported type checker is Pyre on Windows.
 
 ## Reporting Conformance Results
 
 Different type checkers report errors in different ways (with different wording in error messages and different line numbers or character ranges for errors). This variation makes it difficult to fully automate test validation given that tests will want to check for both false positive and false negative type errors. Some level of manual inspection will therefore be needed to determine whether a type checker is fully conformant with all tests in any given test file. This "scoring" process is required only when the output of a test changes — e.g. when a new version of that type checker is released and the tests are rerun. We assume that the output of a type checker will be the same from one run to the next unless/until a new version is released that fixes or introduces a bug. In this case, the output will need to be manually inspected and the conformance results re-scored for those tests whose output has changed.
 
-Conformance results are reported and summarized for each supported type checker. Currently, results are reported for mypy, pyre, pyright, and pytype. It is the goal and desire to add additional type checkers over time.
+[Conformance results](https://htmlpreview.github.io/?https://github.com/python/typing/blob/main/conformance/results/results.html) are reported and summarized for each supported type checker. Currently, results are reported for mypy, pyrefly, pyright, zuban, ty, and pycroscope. It is the goal and desire to add additional type checkers over time.
 
 ## Adding a New Test Case
 
@@ -93,7 +93,22 @@ If a test is updated (augmented or fixed), the process is similar to when adding
 
 ## Updating a Type Checker
 
-If a new version of a type checker is released, re-run the test tool with the new version. If the type checker output has changed for any test cases, the tool will supply the old and new outputs. Examine these to determine whether the conformance status has changed. Once the conformance status has been updated, re-run the test tool again to regenerate the summary report.
+Type checker versions are locked in `uv.lock`.
+
+To bump all supported checkers to their latest released versions:
+
+```bash
+python scripts/bump_type_checkers.py
+```
+
+After bumping, install the new lockfile and rerun conformance:
+
+```bash
+uv sync --python 3.12 --frozen
+uv run --python 3.12 --frozen python src/main.py
+```
+
+If checker output changes for any test cases, examine those deltas to determine whether the conformance status has changed. Once the conformance status has been updated, rerun the tool to regenerate the summary report.
 
 ## Automated Conformance Checking
 

conformance/pyproject.toml

@@ -0,0 +1,19 @@
+[project]
+name = "typing-conformance"
+version = "0.1.0"
+requires-python = "==3.12.*"
+dependencies = [
+    "jinja2",
+    "markdown",
+    "mypy",
+    "pycroscope",
+    "pyrefly==1.3.0.dev1",
+    "pyright",
+    "tomlkit",
+    "ty",
+    "types-markdown",
+    "zuban",
+]
+
+[tool.uv]
+package = false