Bump mypy to 1.18.1 (#2810)

Author: sobolevn

django-stubs/contrib/contenttypes/admin.pyi

@@ -2,6 +2,7 @@ from typing import Any
 
 from django.contrib.admin.checks import InlineModelAdminChecks
 from django.contrib.admin.options import InlineModelAdmin
+from django.contrib.contenttypes.forms import BaseGenericInlineFormSet
 from django.db.models.base import Model
 
 class GenericInlineModelAdminChecks(InlineModelAdminChecks):
@@ -10,6 +11,7 @@ class GenericInlineModelAdminChecks(InlineModelAdminChecks):
 
 class GenericInlineModelAdmin(InlineModelAdmin):
     template: str
+    formset: type[BaseGenericInlineFormSet]  # type: ignore[assignment]
 
 class GenericStackedInline(GenericInlineModelAdmin): ...
 class GenericTabularInline(GenericInlineModelAdmin): ...

django-stubs/contrib/postgres/fields/ranges.pyi

@@ -48,8 +48,8 @@ class DecimalRangeField(RangeField[NumericRange]):
     form_field: type[forms.DecimalRangeField]
 
 class DateTimeRangeField(RangeField[DateTimeTZRange]):
-    base_field: type[models.DecimalField]
-    form_field: type[forms.DecimalRangeField]
+    base_field: type[models.DateTimeField]
+    form_field: type[forms.DateTimeRangeField]
 
 class DateRangeField(RangeField[DateRange]):
     base_field: type[models.DateField]

django-stubs/db/models/lookups.pyi

@@ -1,7 +1,6 @@
 from collections.abc import Iterable, Sequence
 from typing import Any, Generic, Literal, TypeVar
 
-from django.core.exceptions import EmptyResultSet
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.models.expressions import Combinable, Expression, Func
 from django.db.models.fields import BooleanField
@@ -79,8 +78,8 @@ class LessThan(FieldGetDbPrepValueMixin, BuiltinLookup[_T]): ...
 class LessThanOrEqual(FieldGetDbPrepValueMixin, BuiltinLookup[_T]): ...
 
 class IntegerFieldOverflow:
-    underflow_exception: type[EmptyResultSet]
-    overflow_exception: type[EmptyResultSet]
+    underflow_exception: type[Exception]
+    overflow_exception: type[Exception]
     def process_rhs(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper) -> _AsSqlType: ...
 
 class IntegerFieldFloatRounding:

django-stubs/urls/resolvers.pyi

@@ -45,8 +45,6 @@ def get_ns_resolver(ns_pattern: str, resolver: URLResolver, converters: tuple) -
 _Pattern: TypeAlias = RegexPattern | RoutePattern | LocalePrefixPattern
 
 class LocaleRegexDescriptor:
-    attr: str
-    def __init__(self, attr: Any) -> None: ...
     @overload
     def __get__(self, instance: None, cls: type[_Pattern] = ...) -> LocaleRegexDescriptor: ...
     @overload

django-stubs/utils/datastructures.pyi

@@ -62,7 +62,7 @@ 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]
+    @overload
     def get(self, key: _K, default: None = None) -> _V | None: ...
     @overload
     def get(self, key: _K, default: _V) -> _V: ...

mypy_django_plugin/transformers/managers.py

@@ -135,7 +135,7 @@ def _process_dynamic_method(
     # used by the typing stubs.
     if method_name in MANAGER_METHODS_RETURNING_QUERYSET:
         ret_type = queryset_instance
-        variables = []
+        variables = ()
     args_types = method_type.arg_types[1:]
     if _has_compatible_type_vars(base_that_has_method):
         typed_var = manager_instance.args or queryset_info.bases[0].args

pyproject.toml

@@ -41,7 +41,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-compatible-mypy = ["mypy>=1.13,<1.18"]
+compatible-mypy = ["mypy>=1.13,<1.19"]
 oracle = ["oracledb"]
 redis = ["redis", "types-redis"]
 
@@ -59,7 +59,7 @@ tests = [
     "jinja2==3.1.6",
     "pyyaml==6.0.2",
     # typing:
-    "mypy==1.17.1",
+    "mypy==1.18.1",
     "django-stubs[compatible-mypy,oracle,redis]",
 ]
 pyright = [

scripts/stubtest/allowlist.txt

@@ -55,11 +55,15 @@ django.utils.datastructures.ImmutableList.sort
 django.utils.datastructures.ImmutableList.reverse
 
 # Promise is lazy, see notes in .pyi
+django.utils.functional.Promise.__init__
 django.utils.functional.Promise.__add__
 django.utils.functional.Promise.__deepcopy__
 django.utils.functional.Promise.__radd__
 django.utils.functional.Promise.__mod__
 
+# `classonlymethod` is an alias for `@classmethod` which is disjoint:
+django.utils.decorators.classonlymethod
+
 # Lazy regex
 django.contrib.admin.utils.UNQUOTE_RE
 django.contrib.gis.geometry.hex_regex

scripts/stubtest/allowlist_todo.txt

@@ -23,7 +23,6 @@ django.contrib.admin.models.LogEntry.object_id
 django.contrib.admin.models.LogEntry.object_repr
 django.contrib.admin.models.LogEntry.user
 django.contrib.admin.models.LogEntry.user_id
-django.contrib.admin.options.BaseModelAdmin.form
 django.contrib.admin.options.BaseModelAdmin.media
 django.contrib.admin.options.InlineModelAdmin.model
 django.contrib.admin.options.InlineModelAdmin.template
@@ -38,7 +37,6 @@ django.contrib.admin.utils.prepare_lookup_value
 django.contrib.admin.views.autocomplete.AutocompleteJsonView.admin_site
 django.contrib.admin.views.autocomplete.AutocompleteJsonView.process_request
 django.contrib.admin.views.autocomplete.AutocompleteJsonView.serialize_result
-django.contrib.admin.views.main.ChangeList.search_form_class
 django.contrib.admin.widgets.AutocompleteMixin.media
 django.contrib.admin.widgets.FilteredSelectMultiple.Media
 django.contrib.admin.widgets.BaseAdminTimeWidget.Media
@@ -48,7 +46,6 @@ django.contrib.admindocs.utils.remove_non_capturing_groups
 django.contrib.admindocs.utils.replace_metacharacters
 django.contrib.auth.admin.GroupAdmin.formfield_for_manytomany
 django.contrib.auth.admin.UserAdmin.fieldsets
-django.contrib.auth.admin.UserAdmin.form
 django.contrib.auth.admin.UserAdmin.get_form
 django.contrib.auth.base_user.AbstractBaseUser.last_login
 django.contrib.auth.base_user.AbstractBaseUser.password
@@ -295,27 +292,20 @@ django.contrib.gis.db.models.lookups.RasterBandTransform.as_sql
 django.contrib.gis.forms.ALL_FIELDS
 django.contrib.gis.forms.BaseForm.__init__
 django.contrib.gis.forms.BaseFormSet.__init__
-django.contrib.gis.forms.BaseModelForm.__init__
 django.contrib.gis.forms.BaseModelFormSet.model
 django.contrib.gis.forms.ChoiceField.__deepcopy__
 django.contrib.gis.forms.Field.__deepcopy__
-django.contrib.gis.forms.Field.hidden_widget
 django.contrib.gis.forms.FileField.bound_data
 django.contrib.gis.forms.Media.__html__
 django.contrib.gis.forms.ModelChoiceField.__deepcopy__
-django.contrib.gis.forms.ModelMultipleChoiceField.hidden_widget
 django.contrib.gis.forms.MultiValueField.__deepcopy__
 django.contrib.gis.forms.MultiWidget.use_fieldset
-django.contrib.gis.forms.MultipleChoiceField.hidden_widget
 django.contrib.gis.forms.RadioSelect.id_for_label
 django.contrib.gis.forms.RadioSelect.use_fieldset
-django.contrib.gis.forms.SelectDateWidget.select_widget
 django.contrib.gis.forms.SelectDateWidget.use_fieldset
-django.contrib.gis.forms.SplitDateTimeField.hidden_widget
 django.contrib.gis.forms.Widget.use_fieldset
 django.contrib.gis.forms.formset_factory
 django.contrib.gis.forms.inlineformset_factory
-django.contrib.gis.forms.modelform_factory
 django.contrib.gis.forms.modelformset_factory
 django.contrib.gis.gdal.OGRGeometry.geojson
 django.contrib.gis.gdal.SpatialReference.pretty_wkt
@@ -353,8 +343,6 @@ django.contrib.postgres.fields.RangeField.formfield
 django.contrib.postgres.fields.array.ArrayField.formfield
 django.contrib.postgres.fields.hstore.HStoreField.formfield
 django.contrib.postgres.fields.ranges.RangeField.formfield
-django.contrib.postgres.forms.BaseRangeField.hidden_widget
-django.contrib.postgres.forms.ranges.BaseRangeField.hidden_widget
 django.contrib.redirects.models.Redirect.id
 django.contrib.redirects.models.Redirect.new_path
 django.contrib.redirects.models.Redirect.old_path
@@ -903,46 +891,33 @@ django.db.utils.DatabaseErrorWrapper.__call__
 django.forms.ALL_FIELDS
 django.forms.BaseForm.__init__
 django.forms.BaseFormSet.__init__
-django.forms.BaseModelForm.__init__
 django.forms.BaseModelFormSet.model
 django.forms.ChoiceField.__deepcopy__
 django.forms.Field.__deepcopy__
-django.forms.Field.hidden_widget
 django.forms.FileField.bound_data
 django.forms.Media.__html__
 django.forms.ModelChoiceField.__deepcopy__
-django.forms.ModelMultipleChoiceField.hidden_widget
 django.forms.MultiValueField.__deepcopy__
 django.forms.MultiWidget.use_fieldset
-django.forms.MultipleChoiceField.hidden_widget
 django.forms.RadioSelect.id_for_label
 django.forms.RadioSelect.use_fieldset
-django.forms.SelectDateWidget.select_widget
 django.forms.SelectDateWidget.use_fieldset
-django.forms.SplitDateTimeField.hidden_widget
 django.forms.Widget.use_fieldset
 django.forms.boundfield.BoundWidget.__html__
 django.forms.fields.ChoiceField.__deepcopy__
 django.forms.fields.Field.__deepcopy__
-django.forms.fields.Field.hidden_widget
 django.forms.fields.FileField.bound_data
 django.forms.fields.MultiValueField.__deepcopy__
-django.forms.fields.MultipleChoiceField.hidden_widget
-django.forms.fields.SplitDateTimeField.hidden_widget
 django.forms.forms.BaseForm.__init__
 django.forms.formset_factory
 django.forms.formsets.BaseFormSet.__init__
 django.forms.formsets.ManagementForm.__init__
 django.forms.formsets.formset_factory
 django.forms.inlineformset_factory
-django.forms.modelform_factory
 django.forms.modelformset_factory
-django.forms.models.BaseModelForm.__init__
 django.forms.models.BaseModelFormSet.model
 django.forms.models.ModelChoiceField.__deepcopy__
-django.forms.models.ModelMultipleChoiceField.hidden_widget
 django.forms.models.inlineformset_factory
-django.forms.models.modelform_factory
 django.forms.models.modelformset_factory
 django.forms.renderers.DjangoDivFormRenderer
 django.forms.widgets.ChoiceWidget.template_name
@@ -951,7 +926,6 @@ django.forms.widgets.Media.__html__
 django.forms.widgets.MultiWidget.use_fieldset
 django.forms.widgets.RadioSelect.id_for_label
 django.forms.widgets.RadioSelect.use_fieldset
-django.forms.widgets.SelectDateWidget.select_widget
 django.forms.widgets.SelectDateWidget.use_fieldset
 django.forms.widgets.Widget.use_fieldset
 django.template.VariableDoesNotExist.__init__

tests/assert_type/db/models/test_constraints.py

@@ -13,4 +13,7 @@
     name="unique_mess",
 )
 
-CheckConstraint(name="less_than_constraint", check=LessThan[Any](F("months"), 1))  # pyright: ignore[reportDeprecated]
+CheckConstraint(  # type: ignore[deprecated]  # pyright: ignore[reportDeprecated]
+    name="less_than_constraint",
+    check=LessThan[Any](F("months"), 1),
+)