Merge pull request #135 from altendky/mypy_for_tests

Author: altendky

tests/cases/forward_reference.py

@@ -13,18 +13,20 @@
 
 
 for module in [dataclasses, attr]:
+    # Type ignores are just here for now instead of figuring out how to
+    # handle these properly.
 
-    @module.dataclass
+    @module.dataclass  # type: ignore[attr-defined]
     class A:
         x: "B"
 
-    @module.dataclass
+    @module.dataclass  # type: ignore[attr-defined]
     class B:
         y: int
 
     schema = desert.schema_class(A)()
     dumped = {"x": {"y": 1}}
-    loaded = A((B(1)))
+    loaded = A((B(1)))  # type:ignore[call-arg]
 
     assert schema.load(dumped) == loaded
     assert schema.dump(loaded) == dumped

tests/test_make.py

@@ -42,33 +42,33 @@ def dataclass_param(request):
 
 
 def _assert_load(
-    schema: t.Type[marshmallow.Schema], loaded: t.Any, dumped: t.Dict[t.Any, t.Any]
+    schema: marshmallow.Schema, loaded: t.Any, dumped: t.Dict[t.Any, t.Any]
 ) -> None:
     assert schema.load(dumped) == loaded
 
 
 def _assert_dump(
-    schema: t.Type[marshmallow.Schema], loaded: t.Any, dumped: t.Dict[t.Any, t.Any]
+    schema: marshmallow.Schema, loaded: t.Any, dumped: t.Dict[t.Any, t.Any]
 ) -> None:
     assert schema.dump(loaded) == dumped
 
 
 def _assert_dump_load(
-    schema: t.Type[marshmallow.Schema], loaded: t.Any, dumped: t.Dict[t.Any, t.Any]
+    schema: marshmallow.Schema, loaded: t.Any, dumped: t.Dict[t.Any, t.Any]
 ) -> None:
     assert schema.loads(schema.dumps(loaded)) == loaded
 
 
 def _assert_load_dump(
-    schema: t.Type[marshmallow.Schema], loaded: t.Any, dumped: t.Dict[t.Any, t.Any]
+    schema: marshmallow.Schema, loaded: t.Any, dumped: t.Dict[t.Any, t.Any]
 ) -> None:
     assert schema.dump(schema.load(dumped)) == dumped
 
 
 def fixture_from_dict(
     name: str,
     id_to_value: t.Mapping[
-        str, t.Callable[[t.Type[marshmallow.Schema], t.Dict[t.Any, t.Any], t.Any], None]
+        str, t.Callable[[marshmallow.Schema, t.Dict[t.Any, t.Any], t.Any], None]
     ],
 ):
     """
@@ -434,7 +434,8 @@ class B:
 
 
 @pytest.mark.xfail(
-    condition=sys.implementation.name == "pypy" and sys.pypy_version_info < (7, 2),
+    # type ignored due to foss.heptapod.net/pypy/pypy/-/issues/3129
+    condition=sys.implementation.name == "pypy" and sys.pypy_version_info < (7, 2),  # type: ignore[attr-defined]
     reason="Forward references and string annotations are broken in PyPy3 < 7.2",
     strict=True,
 )

tox.ini

@@ -44,7 +44,7 @@ commands =
     check-manifest {toxinidir}
     black --check {toxinidir}
     isort --verbose --check-only --diff src tests setup.py
-    mypy src/desert/
+    mypy src/desert/ tests/
 
 [testenv:spell]
 setenv =