Update recommended mypy & CI to 1.1.1, update MultiValueDict (#1391)

* Updated mypy to 1.1.1 for compatible-mypy and CI
* Fixes MultiValueDict.setdefault() compatibility with MutableMapping from newer typeshed
* Error messages in test_items_custom_model were reordered

Author: intgr

django-stubs/utils/datastructures.pyi

@@ -65,7 +65,10 @@ class MultiValueDict(dict[_K, _V]):
     def get(self, key: _K, default: _Z = ...) -> _V | _Z: ...
     def getlist(self, key: _K, default: _Z = ...) -> list[_V] | _Z: ...
     def setlist(self, key: _K, list_: list[_V]) -> None: ...
-    def setdefault(self, key: _K, default: _V = ...) -> _V: ...
+    @overload
+    def setdefault(self: MultiValueDict[_K, _V | None], key: _K, default: None = ...) -> _V | None: ...
+    @overload
+    def setdefault(self, key: _K, default: _V) -> _V: ...
     def setlistdefault(self, key: _K, default_list: list[_V] | None = ...) -> list[_V]: ...
     def appendlist(self, key: _K, value: _V) -> None: ...
     def items(self) -> Iterator[tuple[_K, _V | list[object]]]: ...  # type: ignore

requirements.txt

@@ -9,4 +9,4 @@ psycopg2-binary
 -e .[compatible-mypy]
 
 # Overrides:
-mypy==1.0.1
+mypy==1.1.1

setup.py

@@ -31,7 +31,7 @@ def find_stub_files(name: str) -> List[str]:
 ]
 
 extras_require = {
-    "compatible-mypy": ["mypy>=1.0,<1.1"],
+    "compatible-mypy": ["mypy>=1.1.1,<1.2"],
 }
 
 setup(

tests/typecheck/contrib/sitemaps/test_generic_sitemap.yml

@@ -45,10 +45,10 @@
         ]
     out: |
         main:24: error: Return type "str" of "items" incompatible with return type "Iterable[Offer]" in supertype "Sitemap"
+        main:26: error: Return type "int" of "location" incompatible with return type "str" in supertype "Sitemap"
         main:26: error: Argument 1 of "location" is incompatible with supertype "Sitemap"; supertype defines the argument type as "Offer"
         main:26: note: This violates the Liskov substitution principle
         main:26: note: See https://mypy.readthedocs.io/en/stable/common_issues.html#incompatible-overrides
-        main:26: error: Return type "int" of "location" incompatible with return type "str" in supertype "Sitemap"
         main:40: error: Argument 1 to "GenericSitemap" has incompatible type "Dict[str, List[int]]"; expected "Mapping[str, Union[datetime, _QuerySet[Offer, Offer], str]]"
 
     installed_apps: