Merge remote-tracking branch 'upstream/master' into generic-dataclasses

Author: dairiki

.github/workflows/python-package.yml

@@ -10,6 +10,7 @@ jobs:
 
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         python_version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.9"]
 

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.2.0
+  rev: v3.2.3
   hooks:
   - id: pyupgrade
     args: ["--py36-plus"]
@@ -9,13 +9,14 @@ repos:
   hooks:
   - id: black
     language_version: python3
-- repo: https://gitlab.com/pycqa/flake8
+- repo: https://github.com/PyCQA/flake8
+  # Flake8==6.0.0 requires python>=3.8.1
   rev: 5.0.4
   hooks:
   - id: flake8
     additional_dependencies: ['flake8-bugbear==22.10.27']
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.982
+  rev: v0.991
   hooks:
   - id: mypy
     additional_dependencies: [marshmallow-enum,typeguard,marshmallow]

marshmallow_dataclass/__init__.py

@@ -116,7 +116,7 @@ def dataclass(
 # underscore.  The presence of _cls is used to detect if this
 # decorator is being called with parameters or not.
 def dataclass(
-    _cls: Type[_U] = None,
+    _cls: Optional[Type[_U]] = None,
     *,
     repr: bool = True,
     eq: bool = True,
@@ -173,16 +173,16 @@ def add_schema(_cls: Type[_U]) -> Type[_U]:
 
 @overload
 def add_schema(
-    base_schema: Type[marshmallow.Schema] = None,
+    base_schema: Optional[Type[marshmallow.Schema]] = None,
 ) -> Callable[[Type[_U]], Type[_U]]:
     ...
 
 
 @overload
 def add_schema(
     _cls: Type[_U],
-    base_schema: Type[marshmallow.Schema] = None,
-    cls_frame: types.FrameType = None,
+    base_schema: Optional[Type[marshmallow.Schema]] = None,
+    cls_frame: Optional[types.FrameType] = None,
 ) -> Type[_U]:
     ...
 
@@ -224,7 +224,7 @@ def decorator(clazz: Type[_U]) -> Type[_U]:
 def class_schema(
     clazz: type,
     base_schema: Optional[Type[marshmallow.Schema]] = None,
-    clazz_frame: types.FrameType = None,
+    clazz_frame: Optional[types.FrameType] = None,
 ) -> Type[marshmallow.Schema]:
     """
     Convert a class to a marshmallow schema
@@ -371,7 +371,7 @@ def _dataclass_fields(clazz: type) -> Tuple[dataclasses.Field, ...]:
 def _internal_class_schema(
     clazz: type,
     base_schema: Optional[Type[marshmallow.Schema]] = None,
-    clazz_frame: types.FrameType = None,
+    clazz_frame: Optional[types.FrameType] = None,
     generic_params_to_args: Optional[Tuple[Tuple[type, type], ...]] = None,
 ) -> Type[marshmallow.Schema]:
     _RECURSION_GUARD.seen_classes[clazz] = clazz.__name__
@@ -611,7 +611,7 @@ def _field_for_generic_type(
 def field_for_schema(
     typ: type,
     default=marshmallow.missing,
-    metadata: Mapping[str, Any] = None,
+    metadata: Optional[Mapping[str, Any]] = None,
     base_schema: Optional[Type[marshmallow.Schema]] = None,
     typ_frame: Optional[types.FrameType] = None,
     generic_params_to_args: Optional[Tuple[Tuple[type, type], ...]] = None,
@@ -761,7 +761,7 @@ def _base_schema(
     # Remove `type: ignore` when mypy handles dynamic base classes
     # https://github.com/python/mypy/issues/2813
     class BaseSchema(base_schema or marshmallow.Schema):  # type: ignore
-        def load(self, data: Mapping, *, many: bool = None, **kwargs):
+        def load(self, data: Mapping, *, many: Optional[bool] = None, **kwargs):
             all_loaded = super().load(data, many=many, **kwargs)
             many = self.many if many is None else bool(many)
             if many:
@@ -807,7 +807,7 @@ def _generic_params_to_args(clazz: type) -> Tuple[Tuple[type, type], ...]:
 
 def _dataclass_type_hints(
     clazz: type,
-    clazz_frame: types.FrameType = None,
+    clazz_frame: Optional[types.FrameType] = None,
     generic_params_to_args: Optional[Tuple[Tuple[type, type], ...]] = None,
 ) -> Mapping[str, type]:
     localns = clazz_frame.f_locals if clazz_frame else None

marshmallow_dataclass/lazy_class_attribute.py

@@ -1,4 +1,4 @@
-from typing import Any, Callable
+from typing import Any, Callable, Optional
 
 
 __all__ = ("lazy_class_attribute",)
@@ -13,7 +13,10 @@ class LazyClassAttribute:
     __slots__ = ("func", "name", "called", "forward_value")
 
     def __init__(
-        self, func: Callable[..., Any], name: str = None, forward_value: Any = None
+        self,
+        func: Callable[..., Any],
+        name: Optional[str] = None,
+        forward_value: Any = None,
     ):
         self.func = func
         self.name = name

tests/test_class_schema.py

@@ -7,7 +7,7 @@
 try:
     from typing import Final, Literal  # type: ignore[attr-defined]
 except ImportError:
-    from typing_extensions import Final, Literal  # type: ignore[misc]
+    from typing_extensions import Final, Literal  # type: ignore[assignment]
 
 import dataclasses
 from marshmallow import Schema, ValidationError

tests/test_field_for_schema.py

@@ -8,7 +8,7 @@
 try:
     from typing import Final, Literal  # type: ignore[attr-defined]
 except ImportError:
-    from typing_extensions import Final, Literal  # type: ignore[misc]
+    from typing_extensions import Final, Literal  # type: ignore[assignment]
 
 from marshmallow import fields, Schema, validate