Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mypy and pyright tests in CI #1202

Merged
merged 1 commit into from
Nov 11, 2023
Merged

Fix mypy and pyright tests in CI #1202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 29 additions & 27 deletions tests/test_mypy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,16 +209,17 @@
reveal_type(A) # N: Revealed type is "def (b: Any) -> main.A"

- case: testAttrsCmpTrue
regex: true
main: |
from attr import attrib, attrs
@attrs(auto_attribs=True)
class A:
a: int
reveal_type(A) # N: Revealed type is "def (a: builtins.int) -> main.A"
reveal_type(A.__lt__) # N: Revealed type is "def [_AT] (self: _AT`3, other: _AT`3) -> builtins.bool"
reveal_type(A.__le__) # N: Revealed type is "def [_AT] (self: _AT`4, other: _AT`4) -> builtins.bool"
reveal_type(A.__gt__) # N: Revealed type is "def [_AT] (self: _AT`5, other: _AT`5) -> builtins.bool"
reveal_type(A.__ge__) # N: Revealed type is "def [_AT] (self: _AT`6, other: _AT`6) -> builtins.bool"
reveal_type(A) # N: Revealed type is "def \(a: builtins.int\) -> main.A"
reveal_type(A.__lt__) # N: Revealed type is "def \[_AT\] \(self: _AT`\d+, other: _AT`\d+\) -> builtins.bool"
reveal_type(A.__le__) # N: Revealed type is "def \[_AT\] \(self: _AT`\d+, other: _AT`\d+\) -> builtins.bool"
reveal_type(A.__gt__) # N: Revealed type is "def \[_AT\] \(self: _AT`\d+, other: _AT`\d+\) -> builtins.bool"
reveal_type(A.__ge__) # N: Revealed type is "def \[_AT\] \(self: _AT`\d+, other: _AT`\d+\) -> builtins.bool"

A(1) < A(2)
A(1) <= A(2)
Expand All @@ -227,17 +228,17 @@
A(1) == A(2)
A(1) != A(2)

A(1) < 1 # E: Unsupported operand types for < ("A" and "int") [operator]
A(1) <= 1 # E: Unsupported operand types for <= ("A" and "int") [operator]
A(1) > 1 # E: Unsupported operand types for > ("A" and "int") [operator]
A(1) >= 1 # E: Unsupported operand types for >= ("A" and "int") [operator]
A(1) < 1 # E: Unsupported operand types for < \("A" and "int"\) \[operator\]
A(1) <= 1 # E: Unsupported operand types for <= \("A" and "int"\) \[operator\]
A(1) > 1 # E: Unsupported operand types for > \("A" and "int"\) \[operator\]
A(1) >= 1 # E: Unsupported operand types for >= \("A" and "int"\) \[operator\]
A(1) == 1
A(1) != 1

1 < A(1) # E: Unsupported operand types for < ("int" and "A") [operator]
1 <= A(1) # E: Unsupported operand types for <= ("int" and "A") [operator]
1 > A(1) # E: Unsupported operand types for > ("int" and "A") [operator]
1 >= A(1) # E: Unsupported operand types for >= ("int" and "A") [operator]
1 < A(1) # E: Unsupported operand types for < \("int" and "A"\) \[operator\]
1 <= A(1) # E: Unsupported operand types for <= \("int" and "A"\) \[operator\]
1 > A(1) # E: Unsupported operand types for > \("int" and "A"\) \[operator\]
1 >= A(1) # E: Unsupported operand types for >= \("int" and "A"\) \[operator\]
1 == A(1)
1 != A(1)

Expand Down Expand Up @@ -874,6 +875,7 @@
o = C(1, 2, "3")

- case: testAttrsCmpWithSubclasses
regex: true
main: |
import attr
@attr.s
Expand All @@ -885,29 +887,29 @@
@attr.s
class D(A): pass

reveal_type(A.__lt__) # N: Revealed type is "def [_AT] (self: _AT`5, other: _AT`5) -> builtins.bool"
reveal_type(B.__lt__) # N: Revealed type is "def [_AT] (self: _AT`6, other: _AT`6) -> builtins.bool"
reveal_type(C.__lt__) # N: Revealed type is "def [_AT] (self: _AT`7, other: _AT`7) -> builtins.bool"
reveal_type(D.__lt__) # N: Revealed type is "def [_AT] (self: _AT`8, other: _AT`8) -> builtins.bool"
reveal_type(A.__lt__) # N: Revealed type is "def \[_AT\] \(self: _AT`\d+, other: _AT`\d+\) -> builtins.bool"
reveal_type(B.__lt__) # N: Revealed type is "def \[_AT\] \(self: _AT`\d+, other: _AT`\d+\) -> builtins.bool"
reveal_type(C.__lt__) # N: Revealed type is "def \[_AT\] \(self: _AT`\d+, other: _AT`\d+\) -> builtins.bool"
reveal_type(D.__lt__) # N: Revealed type is "def \[_AT\] \(self: _AT`\d+, other: _AT`\d+\) -> builtins.bool"

A() < A()
B() < B()
A() < B() # E: Unsupported operand types for < ("A" and "B") [operator]
A() < B() # E: Unsupported operand types for < \("A" and "B"\) \[operator\]

C() > A()
C() > B()
C() > C()
C() > D() # E: Unsupported operand types for > ("C" and "D") [operator]
C() > D() # E: Unsupported operand types for > \("C" and "D"\) \[operator\]

D() >= A()
D() >= B() # E: Unsupported operand types for >= ("D" and "B") [operator]
D() >= C() # E: Unsupported operand types for >= ("D" and "C") [operator]
D() >= B() # E: Unsupported operand types for >= \("D" and "B"\) \[operator\]
D() >= C() # E: Unsupported operand types for >= \("D" and "C"\) \[operator\]
D() >= D()

A() <= 1 # E: Unsupported operand types for <= ("A" and "int") [operator]
B() <= 1 # E: Unsupported operand types for <= ("B" and "int") [operator]
C() <= 1 # E: Unsupported operand types for <= ("C" and "int") [operator]
D() <= 1 # E: Unsupported operand types for <= ("D" and "int") [operator]
A() <= 1 # E: Unsupported operand types for <= \("A" and "int"\) \[operator\]
B() <= 1 # E: Unsupported operand types for <= \("B" and "int"\) \[operator\]
C() <= 1 # E: Unsupported operand types for <= \("C" and "int"\) \[operator\]
D() <= 1 # E: Unsupported operand types for <= \("D" and "int"\) \[operator\]

- case: testAttrsComplexSuperclass
main: |
Expand Down Expand Up @@ -1075,7 +1077,7 @@
return 7
@attr.s
class A:
x: int = attr.ib(factory=list) # E: Incompatible types in assignment \(expression has type "[Ll]ist\[_T\]", variable has type "int"\) \[assignment\]
x: int = attr.ib(factory=list) # E: Incompatible types in assignment \(expression has type "[Ll]ist\[.*\]", variable has type "int"\) \[assignment\]
y: str = attr.ib(factory=my_factory) # E: Incompatible types in assignment \(expression has type "int", variable has type "str"\) \[assignment\]

- case: testAttrsDefaultAndInit
Expand Down Expand Up @@ -1378,7 +1380,7 @@
a: int
b: str

fields(A) # E: Argument 1 to "fields" has incompatible type "[Tt]ype\[A\]"; expected an attrs class \[misc\] # E: Argument 1 to "fields" has incompatible type "[Tt]ype\[A\]"; expected "[Tt]ype\[AttrsInstance\]" \[arg-type\]
fields(A) # E: Argument 1 to "fields" has incompatible type "[Tt]ype\[A\]"; expected "[Tt]ype\[AttrsInstance\]" \[arg-type\]

- case: testAsDict
main: |
Expand Down
5 changes: 3 additions & 2 deletions tests/test_pyright.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def test_pyright_baseline():
PyrightDiagnostic(
severity="error",
message='Cannot assign member "a" for type '
'"Frozen"\n\xa0\xa0"Frozen" is frozen',
'"Frozen"\n\xa0\xa0"Frozen" is frozen\n\xa0\xa0\xa0\xa0Member "__set__" is unknown',
),
PyrightDiagnostic(
severity="information",
Expand All @@ -74,7 +74,8 @@ def test_pyright_baseline():
PyrightDiagnostic(
severity="error",
message='Cannot assign member "a" for type '
'"FrozenDefine"\n\xa0\xa0"FrozenDefine" is frozen',
'"FrozenDefine"\n\xa0\xa0"FrozenDefine" is frozen\n\xa0\xa0\xa0\xa0'
'Member "__set__" is unknown',
),
PyrightDiagnostic(
severity="information",
Expand Down