Merge remote-tracking branch 'origin/main' into allow-unsound-error-self-classvar

Author: davidhalter

conformance/results/mypy/enums_members.toml

@@ -9,31 +9,23 @@ Does not treat attributes with private names as non-members.
 """
 conformance_automated = "Fail"
 errors_diff = """
-Line 82: Expected 1 errors
-Line 83: Expected 1 errors
-Line 129: Expected 1 errors
-Line 27: Unexpected errors ['enums_members.py:27: error: Expression is of type "Literal[Pet.genus]", not "str"  [assert-type]']
-Line 28: Unexpected errors ['enums_members.py:28: error: Expression is of type "Literal[Pet.species]", not "str"  [assert-type]']
-Line 35: Unexpected errors ['enums_members.py:35: error: Expression is of type "Literal[Pet2.genus]", not "str"  [assert-type]']
-Line 36: Unexpected errors ['enums_members.py:36: error: Expression is of type "Literal[Pet2.species]", not "str"  [assert-type]']
-Line 100: Unexpected errors ['enums_members.py:100: error: Expression is of type "Literal[TrafficLight.AMBER]", not "Literal[TrafficLight.YELLOW]"  [assert-type]']
-Line 117: Unexpected errors ['enums_members.py:117: error: Expression is of type "member[Callable[[Example], None]]", not "Any"  [assert-type]', 'enums_members.py:117: error: Parameter 1 of Literal[...] is invalid  [valid-type]']
+Line 86: Expected 1 errors
+Line 87: Expected 1 errors
+Line 133: Expected 1 errors
+Line 104: Unexpected errors ['enums_members.py:104: error: Expression is of type "Literal[TrafficLight.AMBER]", not "Literal[TrafficLight.YELLOW]"  [assert-type]']
+Line 121: Unexpected errors ['enums_members.py:121: error: Expression is of type "member[Callable[[Example], None]]", not "Any"  [assert-type]', 'enums_members.py:121: error: Parameter 1 of Literal[...] is invalid  [valid-type]']
 """
 output = """
-enums_members.py:27: error: Expression is of type "Literal[Pet.genus]", not "str"  [assert-type]
-enums_members.py:28: error: Expression is of type "Literal[Pet.species]", not "str"  [assert-type]
-enums_members.py:35: error: Expression is of type "Literal[Pet2.genus]", not "str"  [assert-type]
-enums_members.py:36: error: Expression is of type "Literal[Pet2.species]", not "str"  [assert-type]
-enums_members.py:50: error: Enum members must be left unannotated  [misc]
-enums_members.py:50: note: See https://typing.readthedocs.io/en/latest/spec/enums.html#defining-members
-enums_members.py:84: error: Parameter 1 of Literal[...] is invalid  [valid-type]
-enums_members.py:85: error: Parameter 1 of Literal[...] is invalid  [valid-type]
-enums_members.py:100: error: Expression is of type "Literal[TrafficLight.AMBER]", not "Literal[TrafficLight.YELLOW]"  [assert-type]
-enums_members.py:116: error: Expression is of type "int", not "Literal[Example.b]"  [assert-type]
-enums_members.py:117: error: Expression is of type "member[Callable[[Example], None]]", not "Any"  [assert-type]
-enums_members.py:117: error: Parameter 1 of Literal[...] is invalid  [valid-type]
-enums_members.py:128: note: Revealed type is "Any"
-enums_members.py:128: note: 'reveal_type' always outputs 'Any' in unchecked functions
-enums_members.py:146: error: Expression is of type "Literal[Pet5.DOG]", not "int"  [assert-type]
-enums_members.py:147: error: Expression is of type "Literal[Pet5.FISH]", not "int"  [assert-type]
+enums_members.py:54: error: Enum members must be left unannotated  [misc]
+enums_members.py:54: note: See https://typing.readthedocs.io/en/latest/spec/enums.html#defining-members
+enums_members.py:88: error: Parameter 1 of Literal[...] is invalid  [valid-type]
+enums_members.py:89: error: Parameter 1 of Literal[...] is invalid  [valid-type]
+enums_members.py:104: error: Expression is of type "Literal[TrafficLight.AMBER]", not "Literal[TrafficLight.YELLOW]"  [assert-type]
+enums_members.py:120: error: Expression is of type "int", not "Literal[Example.b]"  [assert-type]
+enums_members.py:121: error: Expression is of type "member[Callable[[Example], None]]", not "Any"  [assert-type]
+enums_members.py:121: error: Parameter 1 of Literal[...] is invalid  [valid-type]
+enums_members.py:132: note: Revealed type is "Any"
+enums_members.py:132: note: 'reveal_type' always outputs 'Any' in unchecked functions
+enums_members.py:150: error: Expression is of type "Literal[Pet5.DOG]", not "int"  [assert-type]
+enums_members.py:151: error: Expression is of type "Literal[Pet5.FISH]", not "int"  [assert-type]
 """

conformance/results/mypy/generics_defaults_specialization.toml

@@ -4,10 +4,9 @@ Does not correctly resolve defaults when classes are used directly.
 """
 output = """
 generics_defaults_specialization.py:30: error: Bad number of arguments for type alias, expected between 0 and 1, given 2  [type-arg]
-generics_defaults_specialization.py:45: error: Expression is of type "type[Bar[DefaultStrT]]", not "type[Bar[str]]"  [assert-type]
-generics_defaults_specialization.py:55: error: The type "type[Foo]" is not generic and not indexable  [misc]
+generics_defaults_specialization.py:56: error: The type "type[Foo]" is not generic and not indexable  [misc]
 """
 conformance_automated = "Fail"
 errors_diff = """
-Line 45: Unexpected errors ['generics_defaults_specialization.py:45: error: Expression is of type "type[Bar[DefaultStrT]]", not "type[Bar[str]]"  [assert-type]']
+Line 46: Expected 1 errors
 """

conformance/results/pyrefly/enums_members.toml

@@ -3,15 +3,15 @@ conformance_automated = "Pass"
 errors_diff = """
 """
 output = """
-ERROR enums_members.py:50:5-8: Enum member `DOG` may not be annotated directly. Instead, annotate the `_value_` attribute. [invalid-annotation]
-ERROR enums_members.py:82:20-34: `Pet4.converter` is not a valid enum member [invalid-literal]
-ERROR enums_members.py:83:20-34: `Pet4.transform` is not a valid enum member [invalid-literal]
-ERROR enums_members.py:84:18-30: `Pet4.species` is not a valid enum member [invalid-literal]
-ERROR enums_members.py:85:16-26: `Pet4.speak` is not a valid enum member [invalid-literal]
-ERROR enums_members.py:116:12-43: assert_type(int, Unknown) failed [assert-type]
-ERROR enums_members.py:116:32-41: `Example.b` is not a valid enum member [invalid-literal]
-ERROR enums_members.py:129:20-57: assert_type(int, Unknown) failed [assert-type]
-ERROR enums_members.py:129:43-55: `Example2.__B` is not a valid enum member [invalid-literal]
-ERROR enums_members.py:146:12-27: assert_type(Literal[Pet5.DOG], int) failed [assert-type]
-ERROR enums_members.py:147:12-28: assert_type(Literal[Pet5.FISH], int) failed [assert-type]
+ERROR enums_members.py:54:5-8: Enum member `DOG` may not be annotated directly. Instead, annotate the `_value_` attribute. [invalid-annotation]
+ERROR enums_members.py:86:20-34: `Pet4.converter` is not a valid enum member [invalid-literal]
+ERROR enums_members.py:87:20-34: `Pet4.transform` is not a valid enum member [invalid-literal]
+ERROR enums_members.py:88:18-30: `Pet4.species` is not a valid enum member [invalid-literal]
+ERROR enums_members.py:89:16-26: `Pet4.speak` is not a valid enum member [invalid-literal]
+ERROR enums_members.py:120:12-43: assert_type(int, Unknown) failed [assert-type]
+ERROR enums_members.py:120:32-41: `Example.b` is not a valid enum member [invalid-literal]
+ERROR enums_members.py:133:20-57: assert_type(int, Unknown) failed [assert-type]
+ERROR enums_members.py:133:43-55: `Example2.__B` is not a valid enum member [invalid-literal]
+ERROR enums_members.py:150:12-27: assert_type(Literal[Pet5.DOG], int) failed [assert-type]
+ERROR enums_members.py:151:12-28: assert_type(Literal[Pet5.FISH], int) failed [assert-type]
 """

conformance/results/pyrefly/generics_defaults_specialization.toml

@@ -4,5 +4,6 @@ errors_diff = """
 """
 output = """
 ERROR generics_defaults_specialization.py:30:1-19: Expected 1 type argument for `MyAlias`, got 2 [bad-specialization]
-ERROR generics_defaults_specialization.py:55:1-9: Expected 0 type arguments for `Foo`, got 1 [bad-specialization]
+ERROR generics_defaults_specialization.py:46:22-25: `type[Bar]` is not assignable to `type[Bar[int]]` [bad-assignment]
+ERROR generics_defaults_specialization.py:56:1-9: Expected 0 type arguments for `Foo`, got 1 [bad-specialization]
 """

conformance/results/pyright/enums_members.toml

@@ -6,19 +6,19 @@ conformance_automated = "Pass"
 errors_diff = """
 """
 output = """
-enums_members.py:50:5 - error: Type annotations are not allowed for enum members (reportGeneralTypeIssues)
-enums_members.py:82:20 - error: Type arguments for "Literal" must be None, a literal value (int, bool, str, or bytes), or an enum value (reportInvalidTypeForm)
-enums_members.py:82:25 - error: Variable not allowed in type expression (reportInvalidTypeForm)
-enums_members.py:83:20 - error: Type arguments for "Literal" must be None, a literal value (int, bool, str, or bytes), or an enum value (reportInvalidTypeForm)
-enums_members.py:83:25 - error: Variable not allowed in type expression (reportInvalidTypeForm)
-enums_members.py:84:18 - error: Type arguments for "Literal" must be None, a literal value (int, bool, str, or bytes), or an enum value (reportInvalidTypeForm)
-enums_members.py:85:16 - error: Type arguments for "Literal" must be None, a literal value (int, bool, str, or bytes), or an enum value (reportInvalidTypeForm)
-enums_members.py:116:13 - error: "assert_type" mismatch: expected "Unknown" but received "int" (reportAssertTypeFailure)
-enums_members.py:116:32 - error: Type arguments for "Literal" must be None, a literal value (int, bool, str, or bytes), or an enum value (reportInvalidTypeForm)
-enums_members.py:128:21 - information: Type of "Example2.__B" is "Literal[2]"
-enums_members.py:129:21 - error: "assert_type" mismatch: expected "Unknown" but received "Literal[2]" (reportAssertTypeFailure)
-enums_members.py:129:43 - error: Type arguments for "Literal" must be None, a literal value (int, bool, str, or bytes), or an enum value (reportInvalidTypeForm)
-enums_members.py:129:52 - error: Variable not allowed in type expression (reportInvalidTypeForm)
-enums_members.py:146:13 - error: "assert_type" mismatch: expected "int" but received "Literal[Pet5.DOG]" (reportAssertTypeFailure)
-enums_members.py:147:13 - error: "assert_type" mismatch: expected "int" but received "Literal[Pet5.FISH]" (reportAssertTypeFailure)
+enums_members.py:54:5 - error: Type annotations are not allowed for enum members (reportGeneralTypeIssues)
+enums_members.py:86:20 - error: Type arguments for "Literal" must be None, a literal value (int, bool, str, or bytes), or an enum value (reportInvalidTypeForm)
+enums_members.py:86:25 - error: Variable not allowed in type expression (reportInvalidTypeForm)
+enums_members.py:87:20 - error: Type arguments for "Literal" must be None, a literal value (int, bool, str, or bytes), or an enum value (reportInvalidTypeForm)
+enums_members.py:87:25 - error: Variable not allowed in type expression (reportInvalidTypeForm)
+enums_members.py:88:18 - error: Type arguments for "Literal" must be None, a literal value (int, bool, str, or bytes), or an enum value (reportInvalidTypeForm)
+enums_members.py:89:16 - error: Type arguments for "Literal" must be None, a literal value (int, bool, str, or bytes), or an enum value (reportInvalidTypeForm)
+enums_members.py:120:13 - error: "assert_type" mismatch: expected "Unknown" but received "int" (reportAssertTypeFailure)
+enums_members.py:120:32 - error: Type arguments for "Literal" must be None, a literal value (int, bool, str, or bytes), or an enum value (reportInvalidTypeForm)
+enums_members.py:132:21 - information: Type of "Example2.__B" is "Literal[2]"
+enums_members.py:133:21 - error: "assert_type" mismatch: expected "Unknown" but received "Literal[2]" (reportAssertTypeFailure)
+enums_members.py:133:43 - error: Type arguments for "Literal" must be None, a literal value (int, bool, str, or bytes), or an enum value (reportInvalidTypeForm)
+enums_members.py:133:52 - error: Variable not allowed in type expression (reportInvalidTypeForm)
+enums_members.py:150:13 - error: "assert_type" mismatch: expected "int" but received "Literal[Pet5.DOG]" (reportAssertTypeFailure)
+enums_members.py:151:13 - error: "assert_type" mismatch: expected "int" but received "Literal[Pet5.FISH]" (reportAssertTypeFailure)
 """

conformance/results/pyright/generics_defaults_specialization.toml

@@ -1,8 +1,12 @@
-conformant = "Pass"
+conformant = "Partial"
+notes = """
+Allows incorrect assignment to type[].
+"""
 output = """
 generics_defaults_specialization.py:30:15 - error: Too many type arguments provided for "MyAlias[DefaultStrT@MyAlias]"; expected 1 but received 2 (reportInvalidTypeForm)
-generics_defaults_specialization.py:55:5 - error: Expected no type arguments for class "Foo" (reportInvalidTypeArguments)
+generics_defaults_specialization.py:56:5 - error: Expected no type arguments for class "Foo" (reportInvalidTypeArguments)
 """
-conformance_automated = "Pass"
+conformance_automated = "Fail"
 errors_diff = """
+Line 46: Expected 1 errors
 """