finish strict_optional support, enable it for typechecking of django tests

django-stubs/apps/config.pyi

@@ -12,7 +12,7 @@ class AppConfig:
     verbose_name: str = ...
     path: str = ...
     models_module: None = ...
-    models: Optional[Dict[str, Type[Model]]] = ...
+    models: Dict[str, Type[Model]] = ...
     def __init__(self, app_name: str, app_module: Optional[Any]) -> None: ...
     @classmethod
     def create(cls, entry: str) -> AppConfig: ...

django-stubs/contrib/admin/options.pyi

@@ -57,9 +57,15 @@ class BaseModelAdmin:
     checks_class: Any = ...
     def check(self, **kwargs: Any) -> List[Union[str, Error]]: ...
     def __init__(self) -> None: ...
-    def formfield_for_dbfield(self, db_field: Field, request: WSGIRequest, **kwargs: Any) -> Optional[Field]: ...
-    def formfield_for_choice_field(self, db_field: Field, request: WSGIRequest, **kwargs: Any) -> TypedChoiceField: ...
-    def get_field_queryset(self, db: None, db_field: RelatedField, request: WSGIRequest) -> Optional[QuerySet]: ...
+    def formfield_for_dbfield(
+        self, db_field: Field, request: Optional[WSGIRequest], **kwargs: Any
+    ) -> Optional[Field]: ...
+    def formfield_for_choice_field(
+        self, db_field: Field, request: Optional[WSGIRequest], **kwargs: Any
+    ) -> TypedChoiceField: ...
+    def get_field_queryset(
+        self, db: None, db_field: RelatedField, request: Optional[WSGIRequest]
+    ) -> Optional[QuerySet]: ...
     def formfield_for_foreignkey(
         self, db_field: ForeignKey, request: Optional[WSGIRequest], **kwargs: Any
     ) -> Optional[ModelChoiceField]: ...
@@ -90,7 +96,7 @@ class BaseModelAdmin:
 class ModelAdmin(BaseModelAdmin):
     formfield_overrides: Any
     list_display: Sequence[Union[str, Callable]] = ...
-    list_display_links: Sequence[Union[str, Callable]] = ...
+    list_display_links: Optional[Sequence[Union[str, Callable]]] = ...
     list_filter: Sequence[Union[str, Type[ListFilter], Tuple[str, Type[ListFilter]]]] = ...
     list_select_related: Union[bool, Sequence[str]] = ...
     list_per_page: int = ...

django-stubs/db/migrations/state.pyi

@@ -22,9 +22,9 @@ class ModelState:
     name: str
     app_label: str
     fields: List[Tuple[str, Field]]
-    options: Optional[Dict[str, Any]] = ...
-    bases: Optional[Tuple[Type[Model]]] = ...
-    managers: Optional[List[Tuple[str, Manager]]] = ...
+    options: Dict[str, Any] = ...
+    bases: Tuple[Type[Model]] = ...
+    managers: List[Tuple[str, Manager]] = ...
     def __init__(
         self,
         app_label: str,

django-stubs/db/models/fields/__init__.pyi

@@ -224,7 +224,7 @@ class GenericIPAddressField(Field[_ST, _GT]):
 class DateTimeCheckMixin: ...
 
 class DateField(DateTimeCheckMixin, Field[_ST, _GT]):
-    _pyi_private_set_type: Union[str, date, datetime, Combinable]
+    _pyi_private_set_type: Union[str, date, Combinable]
     _pyi_private_get_type: date
     def __init__(
         self,

django-stubs/db/models/manager.pyi

@@ -4,7 +4,6 @@ from django.db.models.base import Model
 from django.db.models.query import QuerySet
 
 _T = TypeVar("_T", bound=Model, covariant=True)
-_Self = TypeVar("_Self", bound="BaseManager")
 
 class BaseManager(QuerySet[_T]):
     creation_counter: int = ...
@@ -17,9 +16,7 @@ class BaseManager(QuerySet[_T]):
     def deconstruct(self) -> Tuple[bool, str, None, Tuple, Dict[str, int]]: ...
     def check(self, **kwargs: Any) -> List[Any]: ...
     @classmethod
-    def from_queryset(
-        cls: Type[_Self], queryset_class: Type[QuerySet], class_name: Optional[str] = ...
-    ) -> Type[_Self]: ...
+    def from_queryset(cls, queryset_class: Type[QuerySet], class_name: Optional[str] = ...) -> Any: ...
     @classmethod
     def _get_queryset_methods(cls, queryset_class: type) -> Dict[str, Any]: ...
     def contribute_to_class(self, model: Type[Model], name: str) -> None: ...

django-stubs/template/context.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Dict, Iterator, List, Optional, Type, Union
+from typing import Any, Callable, Dict, Iterator, List, Optional, Type, Union, Iterable
 
 from django.http.request import HttpRequest
 from django.template.base import Node, Origin, Template
@@ -15,10 +15,10 @@ class ContextDict(dict):
     def __enter__(self) -> ContextDict: ...
     def __exit__(self, *args: Any, **kwargs: Any) -> None: ...
 
-class BaseContext:
+class BaseContext(Iterable[Any]):
     def __init__(self, dict_: Any = ...) -> None: ...
     def __copy__(self) -> BaseContext: ...
-    def __iter__(self) -> None: ...
+    def __iter__(self) -> Iterator[Any]: ...
     def push(self, *args: Any, **kwargs: Any) -> ContextDict: ...
     def pop(self) -> ContextDict: ...
     def __setitem__(self, key: Union[Node, str], value: Any) -> None: ...
@@ -50,7 +50,6 @@ class Context(BaseContext):
 class RenderContext(BaseContext):
     dicts: List[Dict[Union[IncludeNode, str], str]]
     template: Optional[Template] = ...
-    def __iter__(self) -> None: ...
     def push_state(self, template: Template, isolated_context: bool = ...) -> Iterator[None]: ...
 
 class RequestContext(Context):