cherry-pick mypy 1.12.x support (#27)

upstream PR typeddjango#2408

Co-authored-by: Federico Bond <[email protected]>

Author: asottile-sentry

mypy_django_plugin/lib/helpers.py

@@ -396,13 +396,21 @@ def convert_any_to_type(typ: MypyType, referred_to_type: MypyType) -> MypyType:
 
 
 def make_typeddict(
-    api: Union[SemanticAnalyzer, CheckerPluginInterface], fields: Dict[str, MypyType], required_keys: Set[str]
+    api: Union[SemanticAnalyzer, CheckerPluginInterface],
+    fields: Dict[str, MypyType],
+    required_keys: Set[str],
+    readonly_keys: Set[str],
 ) -> TypedDictType:
     if isinstance(api, CheckerPluginInterface):
         fallback_type = api.named_generic_type("typing._TypedDict", [])
     else:
         fallback_type = api.named_type("typing._TypedDict", [])
-    typed_dict_type = TypedDictType(fields, required_keys=required_keys, fallback=fallback_type)
+    typed_dict_type = TypedDictType(
+        fields,
+        required_keys=required_keys,
+        readonly_keys=readonly_keys,
+        fallback=fallback_type,
+    )
     return typed_dict_type
 
 

mypy_django_plugin/transformers/models.py

@@ -1183,6 +1183,7 @@ def get_annotated_type(
                     api,
                     fields={**annotations.items, **fields_dict.items},
                     required_keys={*annotations.required_keys, *fields_dict.required_keys},
+                    readonly_keys={*annotations.readonly_keys, *fields_dict.readonly_keys},
                 )
     else:
         annotated_model = helpers.lookup_fully_qualified_typeinfo(api, model_type.type.fullname + "@AnnotatedWith")

mypy_django_plugin/transformers/querysets.py

@@ -275,7 +275,12 @@ def extract_proper_type_queryset_annotate(ctx: MethodContext, django_context: Dj
 
     fields_dict = None
     if field_types is not None:
-        fields_dict = helpers.make_typeddict(api, fields=field_types, required_keys=set(field_types.keys()))
+        fields_dict = helpers.make_typeddict(
+            api,
+            fields=field_types,
+            required_keys=set(field_types.keys()),
+            readonly_keys=set(),
+        )
 
     if fields_dict is not None:
         annotated_type = get_annotated_type(api, model_type, fields_dict=fields_dict)
@@ -349,5 +354,5 @@ def extract_proper_type_queryset_values(ctx: MethodContext, django_context: Djan
 
         column_types[field_lookup] = field_lookup_type
 
-    row_type = helpers.make_typeddict(ctx.api, column_types, set(column_types.keys()))
+    row_type = helpers.make_typeddict(ctx.api, column_types, set(column_types.keys()), set())
     return helpers.reparametrize_instance(default_return_type, [model_type, row_type])

requirements.txt

@@ -14,5 +14,5 @@ Django==5.1.1; python_version >= '3.10'
 -e .[redis,compatible-mypy,oracle]
 
 # Overrides:
-mypy==1.11.2
-pyright==1.1.381
+mypy==1.12.0
+pyright==1.1.384

setup.py

@@ -32,7 +32,7 @@ def find_stub_files(name: str) -> List[str]:
 
 # Keep compatible-mypy major.minor version pinned to what we use in CI (requirements.txt)
 extras_require = {
-    "compatible-mypy": ["mypy~=1.11.0"],
+    "compatible-mypy": ["mypy~=1.12.0"],
     "redis": ["redis"],
     "oracle": ["oracledb"],
 }

tests/typecheck/fields/test_base.yml

@@ -171,7 +171,7 @@
             message = models.BinaryField()
         obj = EncodedMessage(b'\x010')
 
-        reveal_type(obj.message) # N: Revealed type is "Union[builtins.bytes, builtins.memoryview]"
+        reveal_type(obj.message) # N: Revealed type is "Union[builtins.bytes, builtins.memoryview[builtins.int]]"
 
 -  case: test_small_auto_field_class_presents_as_int
    main: |