Merge branch 'main' into JelleZijlstra-assert-type

Author: rchen152

.github/workflows/build-docs.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.9
     - name: Install dependencies

.github/workflows/ci.yml

@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3
           cache: "pip"

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

@@ -75,13 +75,12 @@ To run the conformance test suite:
 * Switch to the `src` subdirectory and run `python 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, and pyright. It is the goal and desire to add additional type checkers over time.
+Conformance results are reported and summarized for each supported type checker. Currently, results are reported for mypy, pyrefly, pyright, and zuban. It is the goal and desire to add additional type checkers over time.
 
 ## Adding a New Test Case
 

conformance/requirements.txt

@@ -1,7 +1,7 @@
 tomli
 tomlkit
-tqdm
 pyright
 mypy
 pip
-pyre-check; platform_system != "Windows"
+zuban
+pyrefly

conformance/results/mypy/aliases_newtype.toml

@@ -1,6 +1,6 @@
 conformant = "Partial"
 notes = """
-`NewType`s are considered classes, not functions.
+`NewType`s are incorrectly considered to be classes.
 """
 output = """
 aliases_newtype.py:11: error: Argument 1 to "UserId" has incompatible type "str"; expected "int"  [arg-type]

conformance/results/mypy/annotations_forward_refs.toml

@@ -31,11 +31,8 @@ annotations_forward_refs.py:96: error: Expression is of type int?, not "int"  [a
 """
 conformance_automated = "Fail"
 errors_diff = """
-Line 22: Expected 1 errors
-Line 23: Expected 1 errors
 Line 24: Expected 1 errors
 Line 25: Expected 1 errors
-Line 66: Expected 1 errors
 Line 87: Unexpected errors ['annotations_forward_refs.py:87: error: Function "annotations_forward_refs.ClassD.int" is not valid as a type  [valid-type]']
 Line 96: Unexpected errors ['annotations_forward_refs.py:96: error: Expression is of type int?, not "int"  [assert-type]']
 """

conformance/results/mypy/annotations_generators.toml

@@ -16,7 +16,5 @@ annotations_generators.py:119: error: Incompatible types in "yield from" (actual
 """
 conformance_automated = "Fail"
 errors_diff = """
-Line 87: Expected 1 errors
-Line 92: Expected 1 errors
 Line 135: Expected 1 errors
 """

conformance/results/mypy/classes_classvar.toml

@@ -9,8 +9,6 @@ output = """
 classes_classvar.py:38: error: ClassVar[...] must have at most one type argument  [valid-type]
 classes_classvar.py:39: error: Invalid type: try using Literal[3] instead?  [valid-type]
 classes_classvar.py:40: error: Name "var" is not defined  [name-defined]
-classes_classvar.py:45: error: ClassVar cannot contain type variables  [misc]
-classes_classvar.py:46: error: ClassVar cannot contain type variables  [misc]
 classes_classvar.py:52: error: Incompatible types in assignment (expression has type "dict[Never, Never]", variable has type "list[str]")  [assignment]
 classes_classvar.py:54: error: Variable should not be annotated with both ClassVar and Final  [misc]
 classes_classvar.py:55: error: Invalid type: ClassVar nested inside other type  [valid-type]
@@ -20,7 +18,9 @@ classes_classvar.py:70: error: ClassVar can only be used for assignments in clas
 classes_classvar.py:71: error: ClassVar can only be used for assignments in class body  [misc]
 classes_classvar.py:73: error: ClassVar can only be used for assignments in class body  [misc]
 classes_classvar.py:77: error: ClassVar can only be used for assignments in class body  [misc]
+classes_classvar.py:78: error: ClassVar[...] can't be used inside a type alias  [valid-type]
 classes_classvar.py:111: error: Cannot assign to class variable "stats" via instance  [misc]
+classes_classvar.py:130: error: All protocol members must have explicitly declared types  [misc]
 classes_classvar.py:140: error: Incompatible types in assignment (expression has type "ProtoAImpl", variable has type "ProtoA")  [assignment]
 classes_classvar.py:140: note: "ProtoAImpl" is missing following "ProtoA" protocol member:
 classes_classvar.py:140: note:     z
@@ -29,7 +29,9 @@ classes_classvar.py:140: note: Protocol member ProtoA.y expected class variable,
 """
 conformance_automated = "Fail"
 errors_diff = """
+Line 45: Expected 1 errors
+Line 46: Expected 1 errors
 Line 47: Expected 1 errors
-Line 78: Expected 1 errors
 Line 67: Unexpected errors ['classes_classvar.py:67: error: Invalid type: ClassVar nested inside other type  [valid-type]']
+Line 130: Unexpected errors ['classes_classvar.py:130: error: All protocol members must have explicitly declared types  [misc]']
 """