Update mypy to 1.15.0 (#2502)

typeddjango · Feb 6, 2025 · 02ad718 · 02ad718
1 parent add6826
commit 02ad718
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/django-stubs/core/serializers/xml_serializer.pyi b/django-stubs/core/serializers/xml_serializer.pyi
@@ -1,5 +1,5 @@
 from typing import IO, Any
-from xml.sax.expatreader import ExpatParser as _ExpatParser  # type: ignore[import-not-found]
+from xml.sax.expatreader import ExpatParser
 
 from django.core.serializers import base
 
@@ -31,7 +31,7 @@ class Deserializer(base.Deserializer):
 
 def getInnerText(node: Any) -> str: ...
 
-class DefusedExpatParser(_ExpatParser):
+class DefusedExpatParser(ExpatParser):
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     def start_doctype_decl(self, name: Any, sysid: Any, pubid: Any, has_internal_subset: Any) -> None: ...
     def entity_decl(

diff --git a/requirements.txt b/requirements.txt
@@ -12,5 +12,5 @@ Django==5.1.5; python_version >= '3.10'
 -e .[redis,compatible-mypy,oracle]
 
 # Overrides:
-mypy==1.14.1
+mypy==1.15.0
 pyright==1.1.393
diff --git a/setup.py b/setup.py
@@ -31,7 +31,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.12,<1.15"],
+    "compatible-mypy": ["mypy>=1.12,<1.16"],
     "redis": ["redis"],
     "oracle": ["oracledb"],
 }

diff --git a/tests/typecheck/managers/querysets/test_from_queryset.yml b/tests/typecheck/managers/querysets/test_from_queryset.yml
@@ -948,7 +948,7 @@
         main:12: note: Revealed type is "Type[django.db.models.manager.Manager[django.db.models.base.Model]]"
         main:12: error: Argument 1 to "from_queryset" of "BaseManager" has incompatible type "<typing special form>"; expected "Type[QuerySet[Model, Model]]"  [arg-type]
         main:17: note: Revealed type is "Type[django.db.models.manager.Manager[django.db.models.base.Model]]"
-        main:17: error: Argument 1 to "from_queryset" of "BaseManager" has incompatible type "Type[NonQSGeneric[Any]]"; expected "Type[QuerySet[Model, Model]]"  [arg-type]
+        main:17: error: Argument 1 to "from_queryset" of "BaseManager" has incompatible type "Type[NonQSGeneric[int]]"; expected "Type[QuerySet[Model, Model]]"  [arg-type]
 
 -   case: test_reverse_manager_with_foreign_key
     main: |