Rework Inference Rules section

Update conformance tests accordingly

Restore the `NamedTuple` section

Author: srittau

conformance/README.md

@@ -63,6 +63,7 @@ Test cases support the following special comments for declaring where errors sho
 * `# E[tag]`, where `tag` is an arbitrary string: must appear multiple times in a file with the same tag.
   Exactly one line with this tag must raise an error.
 * `# E[tag+]`: like `# E[tag]`, but errors may be raised on multiple lines.
+* `# E[tag!]`: like `# E[tag]`, but at least one line must not raise an error.
 
 Each comment may be followed by a colon plus an explanation of the error; the explanation is ignored
 by the scoring system.

conformance/results/mypy/qualifiers_final_annotation.toml

@@ -1,51 +1,57 @@
 conformant = "Partial"
 notes = """
+Infers invalid `Literal` values from `float`.
 Does not treat use of `Final` name as if it was replaced by the literal in `NamedTuple` definition.
 Does not allow conditional assignment of `Final` instance variable in `__init__` method.
 Does not allow redefinition of private class variable that is marked `Final` in parent class.
 Does not report modification of local `Final` variable via `for` statement.
 """
 output = """
-qualifiers_final_annotation.py:23: error: Argument 1 to "expects_one" has incompatible type "int"; expected "Literal[1]"  [arg-type]
-qualifiers_final_annotation.py:33: error: Type in Final[...] can only be omitted if there is an initializer  [misc]
-qualifiers_final_annotation.py:35: error: Final[...] takes at most one type argument  [misc]
-qualifiers_final_annotation.py:51: error: Type in Final[...] can only be omitted if there is an initializer  [misc]
-qualifiers_final_annotation.py:55: error: Final name must be initialized with a value  [misc]
-qualifiers_final_annotation.py:71: error: Cannot assign to final attribute "ID5"  [misc]
-qualifiers_final_annotation.py:76: error: Cannot assign to final attribute "ID6"  [misc]
-qualifiers_final_annotation.py:79: error: Can only declare a final attribute in class body or __init__  [misc]
-qualifiers_final_annotation.py:80: error: Can only declare a final attribute in class body or __init__  [misc]
-qualifiers_final_annotation.py:82: error: Cannot assign to final attribute "ID7"  [misc]
-qualifiers_final_annotation.py:84: error: Cannot assign to final attribute "ID7"  [misc]
-qualifiers_final_annotation.py:88: error: Cannot assign to final name "RATE"  [misc]
-qualifiers_final_annotation.py:98: error: Cannot assign to final attribute "DEFAULT_ID"  [misc]
-qualifiers_final_annotation.py:111: error: Cannot assign to final name "BORDER_WIDTH"  [misc]
-qualifiers_final_annotation.py:113: error: Cannot assign to final name "__private"  [misc]
-qualifiers_final_annotation.py:124: error: Final can be only used as an outermost qualifier in a variable annotation  [valid-type]
-qualifiers_final_annotation.py:125: error: Variable should not be annotated with both ClassVar and Final  [misc]
-qualifiers_final_annotation.py:135: error: Final can be only used as an outermost qualifier in a variable annotation  [valid-type]
-qualifiers_final_annotation.py:138: error: Final can be only used as an outermost qualifier in a variable annotation  [valid-type]
-qualifiers_final_annotation.py:148: error: Final[...] can't be used inside a TypedDict  [valid-type]
-qualifiers_final_annotation.py:153: error: Final[...] can't be used inside a NamedTuple  [valid-type]
-qualifiers_final_annotation.py:162: error: Invalid "NamedTuple()" field name  [misc]
-qualifiers_final_annotation.py:164: error: Unexpected keyword argument "x" for "N"  [call-arg]
-qualifiers_final_annotation.py:164: error: Unexpected keyword argument "y" for "N"  [call-arg]
-qualifiers_final_annotation.py:165: error: Unexpected keyword argument "a" for "N"  [call-arg]
-qualifiers_final_annotation.py:166: error: Unexpected keyword argument "x" for "N"  [call-arg]
-qualifiers_final_annotation.py:166: error: Unexpected keyword argument "y" for "N"  [call-arg]
-qualifiers_final_annotation.py:172: error: Cannot assign to final name "ID1"  [misc]
-qualifiers_final_annotation.py:176: error: Cannot assign to final name "x"  [misc]
-qualifiers_final_annotation.py:178: error: Cannot assign to final name "x"  [misc]
-qualifiers_final_annotation.py:183: error: Incompatible types in assignment (expression has type "TextIOWrapper[_WrappedBuffer]", variable has type "int")  [assignment]
+qualifiers_final_annotation.py:26: error: Expression is of type "Literal[3]", not "int"  [assert-type]
+qualifiers_final_annotation.py:31: error: Expression is of type "Literal[3.14]", not "float"  [assert-type]
+qualifiers_final_annotation.py:32: error: Expression is of type "Literal[3.14]", not "float | int"  [assert-type]
+qualifiers_final_annotation.py:39: error: Type in Final[...] can only be omitted if there is an initializer  [misc]
+qualifiers_final_annotation.py:41: error: Final[...] takes at most one type argument  [misc]
+qualifiers_final_annotation.py:57: error: Type in Final[...] can only be omitted if there is an initializer  [misc]
+qualifiers_final_annotation.py:61: error: Final name must be initialized with a value  [misc]
+qualifiers_final_annotation.py:77: error: Cannot assign to final attribute "ID5"  [misc]
+qualifiers_final_annotation.py:82: error: Cannot assign to final attribute "ID6"  [misc]
+qualifiers_final_annotation.py:85: error: Can only declare a final attribute in class body or __init__  [misc]
+qualifiers_final_annotation.py:86: error: Can only declare a final attribute in class body or __init__  [misc]
+qualifiers_final_annotation.py:88: error: Cannot assign to final attribute "ID7"  [misc]
+qualifiers_final_annotation.py:90: error: Cannot assign to final attribute "ID7"  [misc]
+qualifiers_final_annotation.py:94: error: Cannot assign to final name "RATE"  [misc]
+qualifiers_final_annotation.py:104: error: Cannot assign to final attribute "DEFAULT_ID"  [misc]
+qualifiers_final_annotation.py:117: error: Cannot assign to final name "BORDER_WIDTH"  [misc]
+qualifiers_final_annotation.py:119: error: Cannot assign to final name "__private"  [misc]
+qualifiers_final_annotation.py:130: error: Final can be only used as an outermost qualifier in a variable annotation  [valid-type]
+qualifiers_final_annotation.py:131: error: Variable should not be annotated with both ClassVar and Final  [misc]
+qualifiers_final_annotation.py:141: error: Final can be only used as an outermost qualifier in a variable annotation  [valid-type]
+qualifiers_final_annotation.py:144: error: Final can be only used as an outermost qualifier in a variable annotation  [valid-type]
+qualifiers_final_annotation.py:154: error: Final[...] can't be used inside a TypedDict  [valid-type]
+qualifiers_final_annotation.py:159: error: Final[...] can't be used inside a NamedTuple  [valid-type]
+qualifiers_final_annotation.py:168: error: Invalid "NamedTuple()" field name  [misc]
+qualifiers_final_annotation.py:170: error: Unexpected keyword argument "x" for "N"  [call-arg]
+qualifiers_final_annotation.py:170: error: Unexpected keyword argument "y" for "N"  [call-arg]
+qualifiers_final_annotation.py:171: error: Unexpected keyword argument "a" for "N"  [call-arg]
+qualifiers_final_annotation.py:172: error: Unexpected keyword argument "x" for "N"  [call-arg]
+qualifiers_final_annotation.py:172: error: Unexpected keyword argument "y" for "N"  [call-arg]
+qualifiers_final_annotation.py:180: error: Cannot assign to final name "ID1"  [misc]
+qualifiers_final_annotation.py:184: error: Cannot assign to final name "x"  [misc]
 qualifiers_final_annotation.py:186: error: Cannot assign to final name "x"  [misc]
-qualifiers_final_annotation.py:197: error: Cannot assign to final name "TEN"  [misc]
-qualifiers_final_annotation.py:201: error: Cannot assign to final name "PI"  [misc]
+qualifiers_final_annotation.py:191: error: Incompatible types in assignment (expression has type "TextIOWrapper[_WrappedBuffer]", variable has type "int")  [assignment]
+qualifiers_final_annotation.py:194: error: Cannot assign to final name "x"  [misc]
+qualifiers_final_annotation.py:205: error: Cannot assign to final name "TEN"  [misc]
+qualifiers_final_annotation.py:209: error: Cannot assign to final name "PI"  [misc]
 """
 conformance_automated = "Fail"
 errors_diff = """
-Line 180: Expected 1 errors
-Line 76: Unexpected errors ['qualifiers_final_annotation.py:76: error: Cannot assign to final attribute "ID6"  [misc]']
-Line 113: Unexpected errors ['qualifiers_final_annotation.py:113: error: Cannot assign to final name "__private"  [misc]']
-Line 162: Unexpected errors ['qualifiers_final_annotation.py:162: error: Invalid "NamedTuple()" field name  [misc]']
-Line 164: Unexpected errors ['qualifiers_final_annotation.py:164: error: Unexpected keyword argument "x" for "N"  [call-arg]', 'qualifiers_final_annotation.py:164: error: Unexpected keyword argument "y" for "N"  [call-arg]']
+Line 188: Expected 1 errors
+Lines 31, 32: Expected at least one success (tag 'bare3')
+Line 31: Unexpected errors ['qualifiers_final_annotation.py:31: error: Expression is of type "Literal[3.14]", not "float"  [assert-type]']
+Line 32: Unexpected errors ['qualifiers_final_annotation.py:32: error: Expression is of type "Literal[3.14]", not "float | int"  [assert-type]']
+Line 82: Unexpected errors ['qualifiers_final_annotation.py:82: error: Cannot assign to final attribute "ID6"  [misc]']
+Line 119: Unexpected errors ['qualifiers_final_annotation.py:119: error: Cannot assign to final name "__private"  [misc]']
+Line 168: Unexpected errors ['qualifiers_final_annotation.py:168: error: Invalid "NamedTuple()" field name  [misc]']
+Line 170: Unexpected errors ['qualifiers_final_annotation.py:170: error: Unexpected keyword argument "x" for "N"  [call-arg]', 'qualifiers_final_annotation.py:170: error: Unexpected keyword argument "y" for "N"  [call-arg]']
 """

conformance/results/pycroscope/qualifiers_final_annotation.toml

@@ -1,37 +1,47 @@
-conformance_automated = "Pass"
+conformance = "Partial"
+notes = """
+Infers invalid `Literal` values from `float` and `range`.
+"""
+conformance_automated = "Fail"
 errors_diff = """
+Lines 31, 32: Expected at least one success (tag 'bare3')
+Line 31: Unexpected errors ['./qualifiers_final_annotation.py:31:12:   Literal[3.14] is not equivalent to float | int']
+Line 32: Unexpected errors ['./qualifiers_final_annotation.py:32:12:   Literal[3.14] is not equivalent to float | int']
+Line 35: Unexpected errors ['./qualifiers_final_annotation.py:35:12:   Literal[range(0, 3)] is not equivalent to range']
 """
 output = """
-./qualifiers_final_annotation.py:23:12: Incompatible argument type for x: expected Literal[1] but got int [incompatible_argument]
-./qualifiers_final_annotation.py:29:12:   Literal[range(0, 1)] is not equivalent to range
-./qualifiers_final_annotation.py:33:6: Final annotation without assignment requires an explicit type [invalid_qualifier]
-./qualifiers_final_annotation.py:35:6: Invalid type annotation (<class 'str'>, <class 'int'>) [invalid_annotation]
-./qualifiers_final_annotation.py:51:9: Final annotation without assignment requires an explicit type [invalid_qualifier]
-./qualifiers_final_annotation.py:51:4: Final class attributes without initializers must be assigned in __init__ [invalid_qualifier]
-./qualifiers_final_annotation.py:55:4: Final class attributes without initializers must be assigned in __init__ [invalid_qualifier]
-./qualifiers_final_annotation.py:71:8: Cannot assign to final name ID5 [incompatible_assignment]
-./qualifiers_final_annotation.py:79:18: Final instance attributes may be declared only in __init__ [invalid_qualifier]
-./qualifiers_final_annotation.py:80:18: Final instance attributes may be declared only in __init__ [invalid_qualifier]
-./qualifiers_final_annotation.py:82:8: Cannot assign to final name ID7 [incompatible_assignment]
-./qualifiers_final_annotation.py:84:8: Cannot assign to final name ID7 [incompatible_assignment]
-./qualifiers_final_annotation.py:88:0: Cannot assign to final name RATE [incompatible_assignment]
-./qualifiers_final_annotation.py:98:0: Cannot assign to final name DEFAULT_ID [incompatible_assignment]
-./qualifiers_final_annotation.py:111:4: Cannot override final attribute BORDER_WIDTH [incompatible_override]
-./qualifiers_final_annotation.py:124:12: Final cannot be combined with ClassVar [invalid_qualifier]
-./qualifiers_final_annotation.py:125:12: Final cannot be combined with ClassVar [invalid_qualifier]
-./qualifiers_final_annotation.py:135:3: Unrecognized annotation typing.Final[<class 'int'>] [invalid_annotation]
-./qualifiers_final_annotation.py:138:13: Unexpected Final annotation [invalid_qualifier]
-./qualifiers_final_annotation.py:148:7: Unexpected Final annotation [invalid_qualifier]
-./qualifiers_final_annotation.py:153:4: Final class attributes without initializers must be assigned in __init__ [invalid_qualifier]
-./qualifiers_final_annotation.py:165:0: In call to pycroscope.signature.N: Missing required argument 'x' [incompatible_call]
-./qualifiers_final_annotation.py:166:4: Incompatible argument type for x: expected int but got Literal[''] [incompatible_argument]
-./qualifiers_final_annotation.py:166:10: Incompatible argument type for y: expected int but got Literal[''] [incompatible_argument]
-./qualifiers_final_annotation.py:172:4: Cannot assign to final name ID1 [incompatible_assignment]
-./qualifiers_final_annotation.py:176:4: Cannot assign to final name x [incompatible_assignment]
-./qualifiers_final_annotation.py:178:9: Cannot assign to final name x [incompatible_assignment]
-./qualifiers_final_annotation.py:180:8: Cannot assign to final name x [incompatible_assignment]
-./qualifiers_final_annotation.py:183:29: Cannot assign to final name x [incompatible_assignment]
-./qualifiers_final_annotation.py:186:8: Cannot assign to final name x [incompatible_assignment]
-./qualifiers_final_annotation.py:197:0: Cannot assign to final name TEN [incompatible_assignment]
-./qualifiers_final_annotation.py:201:0: Cannot assign to final name PI [incompatible_assignment]
+./qualifiers_final_annotation.py:26:12:   Literal[3] is not equivalent to int
+./qualifiers_final_annotation.py:31:12:   Literal[3.14] is not equivalent to float | int
+./qualifiers_final_annotation.py:32:12:   Literal[3.14] is not equivalent to float | int
+./qualifiers_final_annotation.py:35:12:   Literal[range(0, 3)] is not equivalent to range
+./qualifiers_final_annotation.py:39:6: Final annotation without assignment requires an explicit type [invalid_qualifier]
+./qualifiers_final_annotation.py:41:6: Invalid type annotation (<class 'str'>, <class 'int'>) [invalid_annotation]
+./qualifiers_final_annotation.py:57:9: Final annotation without assignment requires an explicit type [invalid_qualifier]
+./qualifiers_final_annotation.py:57:4: Final class attributes without initializers must be assigned in __init__ [invalid_qualifier]
+./qualifiers_final_annotation.py:61:4: Final class attributes without initializers must be assigned in __init__ [invalid_qualifier]
+./qualifiers_final_annotation.py:77:8: Cannot assign to final name ID5 [incompatible_assignment]
+./qualifiers_final_annotation.py:85:18: Final instance attributes may be declared only in __init__ [invalid_qualifier]
+./qualifiers_final_annotation.py:86:18: Final instance attributes may be declared only in __init__ [invalid_qualifier]
+./qualifiers_final_annotation.py:88:8: Cannot assign to final name ID7 [incompatible_assignment]
+./qualifiers_final_annotation.py:90:8: Cannot assign to final name ID7 [incompatible_assignment]
+./qualifiers_final_annotation.py:94:0: Cannot assign to final name RATE [incompatible_assignment]
+./qualifiers_final_annotation.py:104:0: Cannot assign to final name DEFAULT_ID [incompatible_assignment]
+./qualifiers_final_annotation.py:117:4: Cannot override final attribute BORDER_WIDTH [incompatible_override]
+./qualifiers_final_annotation.py:130:12: Final cannot be combined with ClassVar [invalid_qualifier]
+./qualifiers_final_annotation.py:131:12: Final cannot be combined with ClassVar [invalid_qualifier]
+./qualifiers_final_annotation.py:141:3: Unrecognized annotation typing.Final[<class 'int'>] [invalid_annotation]
+./qualifiers_final_annotation.py:144:13: Unexpected Final annotation [invalid_qualifier]
+./qualifiers_final_annotation.py:154:7: Unexpected Final annotation [invalid_qualifier]
+./qualifiers_final_annotation.py:159:4: Final class attributes without initializers must be assigned in __init__ [invalid_qualifier]
+./qualifiers_final_annotation.py:171:0: In call to pycroscope.signature.N: Missing required argument 'x' [incompatible_call]
+./qualifiers_final_annotation.py:172:4: Incompatible argument type for x: expected int but got Literal[''] [incompatible_argument]
+./qualifiers_final_annotation.py:172:10: Incompatible argument type for y: expected int but got Literal[''] [incompatible_argument]
+./qualifiers_final_annotation.py:180:4: Cannot assign to final name ID1 [incompatible_assignment]
+./qualifiers_final_annotation.py:184:4: Cannot assign to final name x [incompatible_assignment]
+./qualifiers_final_annotation.py:186:9: Cannot assign to final name x [incompatible_assignment]
+./qualifiers_final_annotation.py:188:8: Cannot assign to final name x [incompatible_assignment]
+./qualifiers_final_annotation.py:191:29: Cannot assign to final name x [incompatible_assignment]
+./qualifiers_final_annotation.py:194:8: Cannot assign to final name x [incompatible_assignment]
+./qualifiers_final_annotation.py:205:0: Cannot assign to final name TEN [incompatible_assignment]
+./qualifiers_final_annotation.py:209:0: Cannot assign to final name PI [incompatible_assignment]
 """