Bump mypy and fix compatibility issue with 0.920 #1503
Conversation
|
Thanks for adding the Here's a preview of the changelog: This release adds support for mypy 0.920. Here's the preview release card for twitter: Here's the tweet text: |
Codecov Report
@@ Coverage Diff @@
## main #1503 +/- ##
=======================================
Coverage 98.11% 98.11%
=======================================
Files 128 128
Lines 4396 4396
Branches 746 746
=======================================
Hits 4313 4313
Misses 43 43
Partials 40 40 |
for more information, see https://pre-commit.ci
…rry into mypy-compatibility-fix
…rry into mypy-compatibility-fix
strawberry/utils/await_maybe.py
Outdated
| @@ -8,7 +8,7 @@ | |||
|
|
|||
|
|
|||
| async def await_maybe(value: AwaitableOrValue): | |||
| if inspect.iscoroutine(value): | |||
| if inspect.isawaitable(value): | |||
There was a problem hiding this comment.
Is this change related to the version bump?
There was a problem hiding this comment.
Yeah, mypy 0.910 is ok with this but mypy 0.920 gives:
Incompatible types in "await" (actual type "CoroutineType", expected type "Awaitable[Any]").
We could alter the typing of the function to only accepts coroutines, instead of changing to isawaitable.
There was a problem hiding this comment.
would you be come sending a separate PR just for this? 😊
I think it is worth isolating this change 😊 I also want to make sure there's no breaking change (even though our tests are passing)
There was a problem hiding this comment.
Sure, here's a separate PR - #1505 :)
strawberry/ext/mypy_plugin.py
Outdated
| @@ -507,6 +520,7 @@ def collect_attributes(self) -> Optional[List[DataclassAttribute]]: | |||
| line=stmt.line, | |||
| column=stmt.column, | |||
| type=sym.type, | |||
| kw_only=False, | |||
There was a problem hiding this comment.
Is this change related to the version bump?
There was a problem hiding this comment.
Unrelated to this PR, but why do we use the dict constructor here instead of using a {} literal, @patrick91?
There was a problem hiding this comment.
not 100% sure why this looks different than the mypy plugin: https://github.com/python/mypy/blob/master/mypy/plugins/dataclasses.py#L342
but if I did the change I used dict because I didn't want to change all the params to have quotes :D
There was a problem hiding this comment.
Yeah the mypy dataclasses plugin added support for kw_only in python/mypy#10867, so we need it here as well.
I just put False here to see if things work. I'll compare our plugin to theirs and match the implementation.
strawberry/ext/mypy_plugin.py
Outdated
| @@ -507,6 +520,7 @@ def collect_attributes(self) -> Optional[List[DataclassAttribute]]: | |||
| line=stmt.line, | |||
| column=stmt.column, | |||
| type=sym.type, | |||
| kw_only=False, | |||
There was a problem hiding this comment.
not 100% sure why this looks different than the mypy plugin: https://github.com/python/mypy/blob/master/mypy/plugins/dataclasses.py#L342
but if I did the change I used dict because I didn't want to change all the params to have quotes :D
| params["info"] = cls.info | ||
| attribute = DataclassAttribute(**params) # type: ignore | ||
| if MypyVersion.VERSION >= Decimal("0.920"): | ||
| params["kw_only"] = False |
There was a problem hiding this comment.
we'll need to change this after we merge: #1187
|
I was able to run the plugin with mypy versions |
should be fine I think, no need to make our ci more complicated 😊 |
Bump mypy to 0.920, and fix compatibility issues with the new version.
Details
Mypy introduced a breaking change in it's API in python/mypy#9951, where
TypeVarDefandTypeVarTypewere merged into one class.In addition to bumping the mypy version, we fix the compatibility issue with a simple check which preserves support for older versions of mypy.
This fix is similar to the one in Pydantic - pydantic/pydantic#3175
Types of Changes
Checklist