Merge branch 'update-mypy'

Author: oxan

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.11
+          python-version: 3.13
       - name: Install dependencies
         run: pip install '.[dev]'
       - name: Run mypy

pyproject.toml

@@ -46,7 +46,7 @@ dependencies = [
 dev = [
     "django-stubs",
     "djangorestframework-stubs",
-    "mypy ~= 1.8.0",
+    "mypy ~= 1.15.0",
 ]
 test = [
     "coverage[toml]",

rest_framework_dataclasses/serializers.py

@@ -61,7 +61,7 @@ def _strip_empty_sentinels(data: AnyT, instance: Optional[AnyT] = None) -> AnyT:
         return cast(AnyT, [_strip_empty_sentinels(item) for item in data])
     elif isinstance(data, dict):
         return cast(AnyT, {key: _strip_empty_sentinels(value) for key, value in data.items()})
-    return data
+    return cast(AnyT, data)
 
 
 # noinspection PyMethodMayBeStatic

rest_framework_dataclasses/typing_utils.py

@@ -126,7 +126,7 @@ def get_iterable_element_type(tp: type) -> type:
         raise ValueError('get_iterable_element_type() called with non-iterable type.')
 
     args = get_args(tp)
-    return args[0] if len(args) > 0 else typing.Any
+    return args[0] if len(args) > 0 else typing.Any  # type: ignore
 
 
 def is_mapping_type(tp: type) -> bool:
@@ -156,7 +156,7 @@ def get_mapping_value_type(tp: type) -> type:
         raise ValueError('get_mapping_value_type() called with non-mapping type.')
 
     args = get_args(tp)
-    return args[1] if len(args) == 2 else typing.Any
+    return args[1] if len(args) == 2 else typing.Any  # type: ignore
 
 
 def is_optional_type(tp: type) -> bool:
@@ -278,7 +278,7 @@ def get_final_type(tp: type) -> type:
         raise ValueError('get_final_type() called with non-final type.')
 
     args = get_args(tp)
-    return args[0] if len(args) > 0 else typing.Any
+    return args[0] if len(args) > 0 else typing.Any  # type: ignore
 
 
 def is_type_variable(tp: type) -> bool: