Add support for mypy v1.16 (typeddjango#2703)

ngnpope · sobolevn · jose-reveni · commit 4017cece4500 · 2025-06-09T10:42:08.000+02:00
Co-authored-by: sobolevn &lt;mail@sobolevn.me&gt;
diff --git a/django-stubs/contrib/gis/db/backends/oracle/features.pyi b/django-stubs/contrib/gis/db/backends/oracle/features.pyi
@@ -1,14 +1,9 @@
-from typing import Any
-
 from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures
 from django.db.backends.oracle.features import DatabaseFeatures as OracleDatabaseFeatures
-from django.utils.functional import cached_property
 
 class DatabaseFeatures(BaseSpatialFeatures, OracleDatabaseFeatures):
     supports_add_srs_entry: bool
     supports_geometry_field_introspection: bool
     supports_geometry_field_unique_index: bool
     supports_perimeter_geodetic: bool
     supports_dwithin_distance_expr: bool
-    @cached_property
-    def django_test_skips(self) -> dict[str, Any]: ...  # type: ignore[override]
diff --git a/django-stubs/db/backends/postgresql/features.pyi b/django-stubs/db/backends/postgresql/features.pyi
@@ -45,11 +45,11 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     has_json_operators: bool
     json_key_contains_list_matching_requires_list: bool
     @property
-    def is_postgresql_14(self) -> bool: ...
-    @property
     def is_postgresql_15(self) -> bool: ...
     @cached_property
     def is_postgresql_16(self) -> bool: ...
+    @property
+    def is_postgresql_17(self) -> bool: ...
     has_brin_autosummarize: bool
     has_websearch_to_tsquery: bool
     supports_table_partitions: bool
diff --git a/django-stubs/db/models/fields/__init__.pyi b/django-stubs/db/models/fields/__init__.pyi
@@ -130,7 +130,7 @@ class Field(RegisterLookupMixin, Generic[_ST, _GT]):
     model: type[Model]
     name: str
     verbose_name: _StrOrPromise
-    description: str | _Getter[str]
+    description: _StrOrPromise | _Getter[_StrOrPromise]
     blank: bool
     null: bool
     unique: bool
diff --git a/django-stubs/utils/datastructures.pyi b/django-stubs/utils/datastructures.pyi
@@ -62,8 +62,10 @@ class MultiValueDict(dict[_K, _V]):
     def __init__(self, key_to_list_mapping: Mapping[_K, list[_V] | None]) -> None: ...
     @overload
     def __init__(self, key_to_list_mapping: Iterable[tuple[_K, list[_V]]] = ()) -> None: ...
+    @overload  # type: ignore[override]
+    def get(self, key: _K, default: None = None) -> _V | None: ...
     @overload
-    def get(self, key: _K) -> _V | None: ...
+    def get(self, key: _K, default: _V) -> _V: ...
     @overload
     def get(self, key: _K, default: _Z) -> _V | _Z: ...
     def getlist(self, key: _K, default: _Z | None = None) -> list[_V] | _Z: ...
diff --git a/django-stubs/utils/functional.pyi b/django-stubs/utils/functional.pyi
@@ -97,7 +97,8 @@ class classproperty(Generic[_Get]):
 
 @type_check_only
 class _Getter(Protocol[_Get]):  # noqa: PYI046
-    """Type fake to declare some read-only properties (until `property` builtin is generic)
+    """
+    Type fake to declare some read-only properties (until `property` builtin is generic).
 
     We can use something like `Union[_Getter[str], str]` in base class to avoid errors
     when redefining attribute with property or property with attribute.
diff --git a/ext/django_stubs_ext/db/models/__init__.py b/ext/django_stubs_ext/db/models/__init__.py
@@ -36,8 +36,8 @@ class TypedModelMeta:
         required_db_vendor: ClassVar[Literal["sqlite", "postgresql", "mysql", "oracle"]]
         select_on_save: ClassVar[bool]  # default: False
         indexes: ClassVar[_ListOrTuple[Index]]
-        unique_together: ClassVar[Sequence[Sequence[str]] | Sequence[str]]
-        index_together: ClassVar[Sequence[Sequence[str]] | Sequence[str]]  # Deprecated in Django 4.2
+        unique_together: ClassVar[Sequence[Sequence[str]]]
+        index_together: ClassVar[Sequence[Sequence[str]]]  # Deprecated in Django 4.2
         constraints: ClassVar[_ListOrTuple[BaseConstraint]]
         verbose_name: ClassVar[StrOrPromise]
         verbose_name_plural: ClassVar[StrOrPromise]
diff --git a/pyproject.toml b/pyproject.toml
@@ -41,7 +41,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-compatible-mypy = ["mypy>=1.13,<1.16"]
+compatible-mypy = ["mypy>=1.13,<1.17"]
 oracle = ["oracledb"]
 redis = ["redis", "types-redis"]
 
@@ -59,7 +59,7 @@ tests = [
     "jinja2==3.1.6",
     "pyyaml==6.0.2",
     # typing:
-    "mypy==1.15.0",
+    "mypy==1.16.0",
     "django-stubs[compatible-mypy,oracle,redis]",
 ]
 pyright = ["pyright==1.1.401"]
diff --git a/scripts/stubtest/allowlist.txt b/scripts/stubtest/allowlist.txt
diff --git a/scripts/stubtest/allowlist_todo.txt b/scripts/stubtest/allowlist_todo.txt
@@ -244,7 +244,6 @@ django.contrib.gis.db.models.JSONField.get_transform
 django.contrib.gis.db.models.Lookup.get_prep_lhs
 django.contrib.gis.db.models.Lookup.allowed_default
 django.contrib.gis.db.models.Lookup.lookup_name
-django.contrib.gis.db.models.Lookup.output_field
 django.contrib.gis.db.models.ManyToManyField.__get__
 django.contrib.gis.db.models.ManyToManyField.formfield
 django.contrib.gis.db.models.ManyToManyField.path_infos
@@ -414,14 +413,7 @@ django.core.management.commands.makemessages.TranslatableFile.path
 django.core.servers.basehttp.ServerHandler.__init__
 django.core.servers.basehttp.ThreadedWSGIServer.__init__
 django.db.backends.ddl_references.Expressions
-django.db.backends.mysql.base.DatabaseWrapper.data_type_check_constraints
-django.db.backends.mysql.base.DatabaseWrapper.display_name
-django.db.backends.mysql.base.DatabaseWrapper.mysql_is_mariadb
-django.db.backends.mysql.base.DatabaseWrapper.mysql_server_data
-django.db.backends.mysql.base.DatabaseWrapper.mysql_server_info
-django.db.backends.mysql.base.DatabaseWrapper.mysql_version
 django.db.backends.mysql.base.DatabaseWrapper.ops
-django.db.backends.mysql.base.DatabaseWrapper.sql_mode
 django.db.backends.mysql.features.DatabaseFeatures.can_rename_index
 django.db.backends.mysql.features.DatabaseFeatures.can_return_rows_from_bulk_insert
 django.db.backends.mysql.features.DatabaseFeatures.django_test_skips
@@ -437,8 +429,10 @@ django.db.backends.mysql.introspection.InfoLine._fields
 django.db.backends.mysql.introspection.InfoLine.comment
 django.db.backends.mysql.introspection.TableInfo
 django.db.backends.mysql.schema.DatabaseSchemaEditor.sql_alter_column_comment
+django.db.backends.oracle.features.DatabaseFeatures.django_test_skips
 django.db.backends.oracle.features.DatabaseFeatures.introspected_field_types
 django.db.backends.oracle.features.DatabaseFeatures.supports_collation_on_charfield
+django.db.backends.oracle.features.DatabaseFeatures.supports_frame_exclusion
 django.db.backends.postgresql.base.DatabaseWrapper.Database
 django.db.backends.postgresql.base.DatabaseWrapper.ops
 django.db.backends.postgresql.base.DatabaseWrapper.tzinfo_factory
@@ -595,7 +589,6 @@ django.db.models.JSONField.get_transform
 django.db.models.Lookup.get_prep_lhs
 django.db.models.Lookup.lookup_name
 django.db.models.Lookup.allowed_default
-django.db.models.Lookup.output_field
 django.db.models.ManyToManyField.__get__
 django.db.models.ManyToManyField.formfield
 django.db.models.ManyToManyField.path_infos
@@ -870,7 +863,6 @@ django.db.models.lookups.IExact.process_rhs
 django.db.models.lookups.Lookup.get_prep_lhs
 django.db.models.lookups.Lookup.allowed_default
 django.db.models.lookups.Lookup.lookup_name
-django.db.models.lookups.Lookup.output_field
 django.db.models.lookups.PatternLookup.process_rhs
 django.db.models.query.EmptyQuerySet.__init__
 django.db.models.query.QuerySet.__deepcopy__
@@ -909,7 +901,6 @@ django.db.models.sql.where.WhereNode.get_group_by_cols
 django.db.models.sql.where.WhereNode.get_lookup
 django.db.models.sql.where.WhereNode.get_source_expressions
 django.db.models.sql.where.WhereNode.leaves
-django.db.models.sql.where.WhereNode.output_field
 django.db.models.sql.where.WhereNode.replace_expressions
 django.db.models.sql.where.WhereNode.set_source_expressions
 django.db.models.sql.where.WhereNode.split_having
diff --git a/scripts/stubtest/allowlist_todo_django52.txt b/scripts/stubtest/allowlist_todo_django52.txt
@@ -68,7 +68,6 @@ django.db.backends.postgresql.base.DatabaseWrapper.close_pool
 django.db.backends.postgresql.base.DatabaseWrapper.pool
 django.db.backends.postgresql.compiler
 django.db.backends.postgresql.features.DatabaseFeatures.django_test_skips
-django.db.backends.postgresql.features.DatabaseFeatures.is_postgresql_17
 django.db.backends.postgresql.features.DatabaseFeatures.supports_nulls_distinct_unique_constraints
 django.db.backends.postgresql.psycopg_any
 django.db.backends.sqlite3.base.DatabaseWrapper.transaction_modes
diff --git a/tests/typecheck/contrib/admin/test_options.yml b/tests/typecheck/contrib/admin/test_options.yml
@@ -18,6 +18,9 @@
       class TestModel(models.Model):
           pass
 
+      class TestModelForm(ModelForm[TestModel]):
+          pass
+
       class A(admin.ModelAdmin[TestModel]):
           # BaseModelAdmin
           autocomplete_fields = ("strs",)
@@ -32,7 +35,7 @@
               ("group", {"fields": ("c",), "classes": ("a",), "description": "foo"}),
               (_("lazy"), {"fields": ["bar"]})
           ]
-          form = ModelForm
+          form = TestModelForm
           filter_vertical = ("fields",)
           filter_horizontal = ("plenty", "of", "fields")
           radio_fields = {
diff --git a/tests/typecheck/db/models/test_fields_choices.yml b/tests/typecheck/db/models/test_fields_choices.yml
@@ -11,6 +11,10 @@
     main:4: note:         def __iter__(self) -> Iterator[Union[Tuple[Any, Any], Tuple[str, Iterable[Tuple[Any, Any]]]]]
     main:4: note:     Got:
     main:4: note:         def __iter__(self) -> Iterator[str]
+    main:4: note:     Expected:
+    main:4: note:         def __iter__(self) -> Iterator[Union[Tuple[Any, Any], Tuple[str, Iterable[Tuple[Any, Any]]]]]
+    main:4: note:     Got:
+    main:4: note:         def __iter__(self) -> Iterator[str]
 
 - case: db_models_integerfield_invalid_choices
   main: |
@@ -25,6 +29,10 @@
     main:4: note:         def __iter__(self) -> Iterator[Union[Tuple[Any, Any], Tuple[str, Iterable[Tuple[Any, Any]]]]]
     main:4: note:     Got:
     main:4: note:         def __iter__(self) -> Iterator[str]
+    main:4: note:     Expected:
+    main:4: note:         def __iter__(self) -> Iterator[Union[Tuple[Any, Any], Tuple[str, Iterable[Tuple[Any, Any]]]]]
+    main:4: note:     Got:
+    main:4: note:         def __iter__(self) -> Iterator[str]
 
 - case: db_models_valid_choices
   main: |
diff --git a/tests/typecheck/fields/test_related.yml b/tests/typecheck/fields/test_related.yml
@@ -779,10 +779,10 @@
 -   case: resolve_primary_keys_for_foreign_keys_with_abstract_self_model
     main: |
         from myapp.models import User
-        reveal_type(User().parent)  # N: Revealed type is "myapp.models.User"
+        reveal_type(User().parent)  # N: Revealed type is "myapp.models.AbstractUser"
         reveal_type(User().parent_id)  # N: Revealed type is "builtins.int"
 
-        reveal_type(User().parent2)  # N: Revealed type is "Union[myapp.models.User, None]"
+        reveal_type(User().parent2)  # N: Revealed type is "Union[myapp.models.AbstractUser, None]"
         reveal_type(User().parent2_id)  # N: Revealed type is "Union[builtins.int, None]"
     installed_apps:
         - myapp
diff --git a/tests/typecheck/models/test_create.yml b/tests/typecheck/models/test_create.yml
@@ -39,8 +39,6 @@
     main: |
         from myapp.models import Child4
         Child4.objects.create(name1='n1', name2='n2', value=1, value4=4)
-    out: |
-        myapp/models:9: error: Definition of "child1" in base class "Parent1" is incompatible with definition in base class "Parent2"  [misc]
     installed_apps:
         - myapp
     files:
diff --git a/tests/typecheck/models/test_meta_options.yml b/tests/typecheck/models/test_meta_options.yml
@@ -66,7 +66,7 @@
             class Meta(TypedModelMeta):
                 abstract = 7  # E: Incompatible types in assignment (expression has type "int", base class "TypedModelMeta" defined the type as "bool")  [assignment]
                 verbose_name = ['test']  # E: Incompatible types in assignment (expression has type "List[str]", base class "TypedModelMeta" defined the type as "Union[str, _StrPromise]")  [assignment]
-                unique_together = {1: 2}  # E: Incompatible types in assignment (expression has type "Dict[int, int]", base class "TypedModelMeta" defined the type as "Union[Sequence[Sequence[str]], Sequence[str]]")  [assignment]
+                unique_together = {1: 2}  # E: Incompatible types in assignment (expression has type "Dict[int, int]", base class "TypedModelMeta" defined the type as "Sequence[Sequence[str]]")  [assignment]
                 unknown_attr = True  # can't check this
 
 
diff --git a/uv.lock b/uv.lock
