Makes classes compatible with mypy 1.2

Author: thepabloaguilar

.github/workflows/test.yml

@@ -38,7 +38,8 @@ jobs:
     - name: Run tests
       run: |
         poetry run flake8 .
-        poetry run mypy classes ./tests/**/*.py
+        # TODO: Remove `no-warn-unused-ignores` flag once we drop support for Python 3.7 and 3.8
+        poetry run mypy --no-warn-unused-ignores classes ./tests/**/*.py
         poetry run codespell classes tests docs typesafety README.md CONTRIBUTING.md CHANGELOG.md
         poetry run pytest classes tests docs/pages README.md
         poetry run doc8 -q docs

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 We follow Semantic Versions since the `0.1.0` release.
 
+## Version 0.5.0 WIP
+
+### Features
+
+- Now requires `mypy>=1.2`
 
 ## Version 0.4.1
 

classes/_typeclass.py

@@ -379,7 +379,7 @@ def __call__(
         ],
         *args,
         **kwargs,
-    ) -> _ReturnType:
+    ) -> _ReturnType:  # type: ignore[type-var]
         """
         We use this method to actually call a typeclass.
 

classes/contrib/mypy/typeops/call_signatures.py

@@ -6,10 +6,10 @@
 from mypy.typeops import get_type_vars, make_simplified_union
 from mypy.types import CallableType, Instance, ProperType
 from mypy.types import Type as MypyType
-from mypy.types import TypeVarType, union_items
+from mypy.types import TypeVarType
 from typing_extensions import Final, final
 
-from classes.contrib.mypy.typeops import type_loader
+from classes.contrib.mypy.typeops import type_loader, union
 
 _INCOMPATIBLE_TYPEVAR_MSG: Final = (
     'Argument 1 to {0} has incompatible type "{1}"; expected "{2}"'
@@ -61,7 +61,7 @@ def _infer_type_var(
         first_arg: TypeVarType,
         passed_type: MypyType,
     ) -> CallableType:
-        instance_types = union_items(self._instance_type)
+        instance_types = union.union_items(self._instance_type)
         if isinstance(self._associated_type, Instance):
             instance_types.append(_load_supports_type(
                 first_arg,

classes/contrib/mypy/typeops/mro.py

@@ -4,10 +4,10 @@
 from mypy.subtypes import is_equivalent
 from mypy.types import Instance
 from mypy.types import Type as MypyType
-from mypy.types import UnionType, union_items
+from mypy.types import UnionType
 from typing_extensions import final
 
-from classes.contrib.mypy.typeops import type_loader
+from classes.contrib.mypy.typeops import type_loader, union
 
 
 @final
@@ -78,7 +78,7 @@ def __init__(
         """
         self._associated_type = associated_type
         self._ctx = ctx
-        self._instance_types = union_items(instance_type)
+        self._instance_types = union.union_items(instance_type)
 
         # Why do we store added types in a mutable global state?
         # Because, these types are hard to replicate without the proper context.
@@ -181,7 +181,7 @@ def _remove_unified_type(
         base = instance_type.type.bases[index]
         union_types = [
             type_arg
-            for type_arg in union_items(base.args[0])
+            for type_arg in union.union_items(base.args[0])
             if type_arg not in supports_type.args
         ]
         instance_type.type.bases[index] = supports_type.copy_modified(

classes/contrib/mypy/typeops/type_loader.py

@@ -23,7 +23,7 @@ def load_supports_type(
         [arg_type],
     )
     assert supports_spec
-    supports_spec.type._promote = None  # noqa: WPS437
+    supports_spec.type._promote = []  # noqa: WPS437
     return supports_spec
 
 

classes/contrib/mypy/typeops/union.py

@@ -0,0 +1,13 @@
+from typing import List
+
+from mypy.types import ProperType
+from mypy.types import Type as MypyType
+from mypy.types import flatten_nested_unions, get_proper_type
+
+
+def union_items(typ: MypyType) -> List[ProperType]:
+    """Get and flat all union types."""
+    return [
+        get_proper_type(union_member)
+        for union_member in flatten_nested_unions([typ])
+    ]

classes/contrib/mypy/validation/validate_instance/validate_runtime.py

@@ -2,8 +2,7 @@
 
 from mypy.erasetype import erase_type
 from mypy.plugin import MethodContext
-from mypy.sametypes import is_same_type
-from mypy.subtypes import is_subtype
+from mypy.subtypes import is_same_type, is_subtype
 from mypy.types import Instance
 from mypy.types import Type as MypyType
 from mypy.types import TypedDictType

poetry.lock

@@ -48,18 +48,18 @@ python = "^3.7"
 typing_extensions = ">=3.10,<5.0"
 
 [tool.poetry.dev-dependencies]
-mypy = "^0.942"
+mypy = "^1.2.0"
 
 wemake-python-styleguide = "^0.17"
 flake8-pytest-style = "^1.6"
-nitpick = "^0.32"
+nitpick = "^0.33.1"
 
 safety = "^2.3"
 
 pytest = "^7.2"
 pytest-cov = "^4.0"
 pytest-randomly = "^3.12"
-pytest-mypy-plugins = "^1.9"
+pytest-mypy-plugins = "^1.10.1"
 
 sphinx = "^5.2"
 sphinx-autodoc-typehints = "^1.20"