Adds github tempaltes, refs #112

.gitignore

@@ -8,6 +8,4 @@ out/
 build/
 dist/
 pip-wheel-metadata/
-.pytest_cache/
-/.envrc
-/.direnv
+.pytest_cache/

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "django-sources"]
+	path = django-sources
+	url = https://github.com/django/django.git
+	branch = stable/2.2.x

.travis.yml

@@ -5,26 +5,18 @@ sudo: required
 jobs:
   include:
     - name: Run plugin test suite with python 3.7
-      python: 3.7
-      script: 'pytest'
-
-    - name: Typecheck Django 3.0 test suite with python 3.7
       python: 3.7
       script: |
-        pip install Django==3.0.*
-        python ./scripts/typecheck_tests.py --django_version=3.0
+        set -e
+        pytest
 
-    - name: Typecheck Django 3.0 test suite with python 3.6
+    - name: Typecheck Django test suite with python 3.7
+      python: 3.7
+      script: 'python ./scripts/typecheck_tests.py'
+
+    - name: Typecheck Django test suite with python 3.6
       python: 3.6
-      script: |
-        pip install Django==3.0.*
-        python ./scripts/typecheck_tests.py --django_version=3.0
-
-    - name: Typecheck Django 2.2 test suite with python 3.7
-      python: 3.7
-      script: |
-        pip install Django==2.2.*
-        python ./scripts/typecheck_tests.py --django_version=2.2
+      script: 'python ./scripts/typecheck_tests.py'
 
     - name: Mypy for plugin code
       python: 3.7
@@ -32,24 +24,18 @@ jobs:
 
     - name: Lint with black
       python: 3.7
-      script: 'black --check django-stubs/'
+      script: 'black --check --line-length=120 django-stubs/'
 
     - name: Lint plugin code with flake8
       python: 3.7
       script: 'flake8'
 
-    - name: Lint stubs with flake8-pyi and check for unused imports
-      python: 3.7
-      script: 'flake8 --config flake8-pyi.ini'
-
     - name: Lint plugin code with isort
       python: 3.7
-      script: 'isort --check --diff'
+      script: 'isort --check'
 
 before_install: |
-  sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y
-  sudo apt-get update
-  sudo apt-get install -y binutils libproj-dev gdal-bin
+  # Upgrade pip, setuptools, and wheel
   pip install -U pip setuptools wheel
 install: |
-  pip install -r ./dev-requirements.txt
+  pip install -r ./dev-requirements.txt

README.md

@@ -2,84 +2,70 @@
 
 # pep484 stubs for Django framework
 
-[![Build Status](https://travis-ci.com/typeddjango/django-stubs.svg?branch=master)](https://travis-ci.com/typeddjango/django-stubs)
+[![Build Status](https://travis-ci.org/typeddjango/django-stubs.svg?branch=master)](https://travis-ci.org/typeddjango/django-stubs)
 [![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
-[![Gitter](https://badges.gitter.im/mypy-django/Lobby.svg)](https://gitter.im/mypy-django/Lobby)
 
 This package contains type stubs and mypy plugin to provide more precise static types and type inference for Django framework. Django uses some Python "magic" that makes having precise types for some code patterns problematic. This is why we need to accompany the stubs with mypy plugins. The final goal is to be able to get precise types for most common patterns.
 
-Could be run on earlier versions of Django, but expect some missing imports warnings.
+Supports Python 3.6/3.7, and Django 2.1/2.2.
 
+Could be run on earlier versions of Django, but expect some missing imports warnings.
 
 ## Installation
 
-```bash
+```
 pip install django-stubs
 ```
 
+### WARNING: All configuration from pre-1.0.0 versions is dropped, use one below.
 
-## Mypy compatibility
-
-| django-stubs | mypy version | django version | python version
-| ------------ | ---- | ---- | ---- |
-| 1.3.0 | 0.750 | 2.2.x | ^3.6
-| 1.2.0 | 0.730 | 2.2.x | ^3.6
-| 1.1.0 | 0.720 | 2.2.x | ^3.6
-| 0.12.x | old semantic analyzer (<0.711), dmypy support | 2.1.x | ^3.6
-
-
-## Configuration
+### WARNING: 1.0.0 breaks `dmypy`, if you need it, stay on the 0.12.x series. 
 
 To make mypy aware of the plugin, you need to add
 
-```ini
+```
 [mypy]
 plugins =
     mypy_django_plugin.main
 ```
 
-in your `mypy.ini` or `setup.cfg` [file](https://mypy.readthedocs.io/en/latest/config_file.html).
+in your `mypy.ini` file.
 
-Plugin also requires Django settings module (what you put into `DJANGO_SETTINGS_MODULE` variable) to be specified.
-
-```ini
+Plugin requires Django settings module (what you put into `DJANGO_SETTINGS_MODULE` variable) to be specified inside `mypy.ini` file.
+```
 [mypy]
 strict_optional = True
 
-# This one is new:
+; this one is new
 [mypy.plugins.django-stubs]
 django_settings_module = mysettings
 ```
+where `mysettings` is a value of `DJANGO_SETTINGS_MODULE` (with or without quotes)
 
-Where `mysettings` is a value of `DJANGO_SETTINGS_MODULE` (with or without quotes)
+Do you have trouble with mypy / the django plugin not finding your settings module? Try adding the root path of your project to your PYTHONPATH environment variable. If you use pipenv you can add the following to an `.env` file in your project root which pipenv will run automatically before executing any commands.:
+```
+PYTHONPATH=${PYTHONPATH}:${PWD}
+```
 
-Current implementation uses Django runtime to extract models information, so it will crash, if your installed apps `models.py` is not correct. For this same reason, you cannot use `reveal_type` inside global scope of any Python file that will be executed for `django.setup()`. 
+New implementation uses Django runtime to extract models information, so it will crash, if your installed apps `models.py` is not correct. For this same reason, you cannot use `reveal_type` inside global scope of any Python file that will be executed for `django.setup()`. 
 
 In other words, if your `manage.py runserver` crashes, mypy will crash too. 
 
-This fully working [typed boilerplate](https://github.com/wemake-services/wemake-django-template) can serve you as an example.
-
-
 ## Notes
 
-Type implementation monkey-patches Django to add `__class_getitem__` to the `Manager` class. 
-If you would use Python3.7 and do that too in your code, you can make things like
-
-```python
+Implementation monkey-patches Django to add `__class_getitem__` to the `Manager` class. If you'd use Python3.7 and do that too in your code, you can make things like
+```
 class MyUserManager(models.Manager['MyUser']):
     pass
-
 class MyUser(models.Model):
-    objects = MyUserManager()
+    objects = UserManager()
 ```
-
 work, which should make a error messages a bit better. 
 
 Otherwise, custom type will be created in mypy, named `MyUser__MyUserManager`, which will rewrite base manager as `models.Manager[User]` to make methods like `get_queryset()` and others return properly typed `QuerySet`. 
 
-
 ## To get help
 
-We have Gitter here: <https://gitter.im/mypy-django/Lobby>
+We have Gitter here https://gitter.im/mypy-django/Lobby.
 
 If you think you have more generic typing issue, please refer to https://github.com/python/mypy and their Gitter.

dev-requirements.txt

@@ -1,8 +1,6 @@
 black
-pytest-mypy-plugins==1.1.0
+pytest-mypy-plugins==1.0.3
 psycopg2
-flake8==3.7.8
-flake8-pyi==19.3.0
-isort==4.3.21
-gitpython==3.0.5
+flake8
+isort==4.3.4
 -e .

django-stubs/apps/config.pyi

@@ -1,6 +1,5 @@
 from typing import Any, Iterator, Type, Optional, Dict
 
-from django.apps.registry import Apps
 from django.db.models.base import Model
 
 MODELS_MODULE_NAME: str
@@ -8,11 +7,11 @@ MODELS_MODULE_NAME: str
 class AppConfig:
     name: str = ...
     module: Optional[Any] = ...
-    apps: Optional[Apps] = ...
+    apps: None = ...
     label: str = ...
     verbose_name: str = ...
     path: str = ...
-    models_module: Optional[str] = ...
+    models_module: None = ...
     models: Dict[str, Type[Model]] = ...
     def __init__(self, app_name: str, app_module: Optional[Any]) -> None: ...
     @classmethod

django-stubs/apps/registry.pyi

@@ -1,6 +1,6 @@
 import threading
 from collections import OrderedDict
-from typing import Any, Callable, DefaultDict, Dict, Iterable, List, Optional, Tuple, Type, Union
+from typing import Any, Callable, List, Optional, Tuple, Type, Union, Iterable, DefaultDict, Dict
 
 from django.db.migrations.state import AppConfigStub
 from django.db.models.base import Model
@@ -8,8 +8,8 @@ from django.db.models.base import Model
 from .config import AppConfig
 
 class Apps:
-    all_models: Dict[str, OrderedDict[str, Type[Model]]] = ...
-    app_configs: OrderedDict[str, AppConfig] = ...
+    all_models: "Dict[str, OrderedDict[str, Type[Model]]]" = ...
+    app_configs: "OrderedDict[str, AppConfig]" = ...
     stored_app_configs: List[Any] = ...
     apps_ready: bool = ...
     ready_event: threading.Event = ...

django-stubs/conf/global_settings.pyi

@@ -345,7 +345,7 @@ SESSION_COOKIE_PATH = "/"
 SESSION_COOKIE_HTTPONLY = True
 # Whether to set the flag restricting cookie leaks on cross-site requests.
 # This can be 'Lax', 'Strict', or None to disable the flag.
-SESSION_COOKIE_SAMESITE: Optional[str] = ...
+SESSION_COOKIE_SAMESITE = "Lax"
 # Whether to save the session data on every request.
 SESSION_SAVE_EVERY_REQUEST = False
 # Whether a user's session cookie expires when the Web browser is closed.
@@ -413,7 +413,7 @@ CSRF_COOKIE_DOMAIN = None
 CSRF_COOKIE_PATH = "/"
 CSRF_COOKIE_SECURE = False
 CSRF_COOKIE_HTTPONLY = False
-CSRF_COOKIE_SAMESITE: Optional[str] = ...
+CSRF_COOKIE_SAMESITE = "Lax"
 CSRF_HEADER_NAME = "HTTP_X_CSRFTOKEN"
 CSRF_TRUSTED_ORIGINS: List[str] = ...
 CSRF_USE_SESSIONS = False

django-stubs/contrib/admin/checks.pyi

@@ -1,6 +1,6 @@
 from typing import Any, List, Union
 
-from django.contrib.admin.options import BaseModelAdmin
+from django.contrib.admin.options import BaseModelAdmin, InlineModelAdmin, ModelAdmin
 from django.core.checks.messages import Error
 
 _CheckError = Union[str, Error]

django-stubs/contrib/admin/decorators.pyi

@@ -1,5 +1,3 @@
-from typing import Any, Callable, Optional, Type
+from typing import Any, Callable, Optional
 
-from django.db.models.base import Model
-
-def register(*models: Type[Model], site: Optional[Any] = ...) -> Callable: ...
+def register(*models: Any, site: Optional[Any] = ...) -> Callable: ...

django-stubs/contrib/admin/filters.pyi

@@ -24,7 +24,7 @@ class SimpleListFilter(ListFilter):
     parameter_name: Any = ...
     lookup_choices: Any = ...
     def value(self) -> Optional[str]: ...
-    def lookups(self, request: Any, model_admin: Any) -> List[Tuple[Any, str]]: ...
+    def lookups(self, request: Any, model_admin: Any) -> None: ...
 
 class FieldListFilter(ListFilter):
     field: Field = ...

django-stubs/contrib/admin/helpers.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union, Iterable
+from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union
 
 from django.contrib.auth.forms import AdminPasswordChangeForm
 from django.forms.boundfield import BoundField
@@ -26,7 +26,7 @@ class AdminForm:
         form: AdminPasswordChangeForm,
         fieldsets: List[Tuple[None, Dict[str, List[str]]]],
         prepopulated_fields: Dict[Any, Any],
-        readonly_fields: Optional[Iterable[Any]] = ...,
+        readonly_fields: Any = ...,
         model_admin: Any = ...,
     ) -> None: ...
     def __iter__(self) -> Iterator[Fieldset]: ...
@@ -47,7 +47,7 @@ class Fieldset:
         self,
         form: Any,
         name: Optional[Any] = ...,
-        readonly_fields: Optional[Iterable[Any]] = ...,
+        readonly_fields: Any = ...,
         fields: Any = ...,
         classes: Any = ...,
         description: Optional[Any] = ...,
@@ -64,7 +64,7 @@ class Fieldline:
     model_admin: Any = ...
     readonly_fields: Any = ...
     def __init__(
-        self, form: Any, field: Any, readonly_fields: Optional[Iterable[Any]] = ..., model_admin: Optional[Any] = ...
+        self, form: Any, field: Any, readonly_fields: Optional[Any] = ..., model_admin: Optional[Any] = ...
     ) -> None: ...
     def __iter__(self) -> Iterator[Union[AdminField, AdminReadonlyField]]: ...
     def errors(self) -> SafeText: ...

django-stubs/contrib/admin/options.pyi

@@ -56,6 +56,7 @@ class BaseModelAdmin:
     show_full_result_count: bool = ...
     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: Optional[HttpRequest], **kwargs: Any
     ) -> Optional[Field]: ...
@@ -86,13 +87,14 @@ class BaseModelAdmin:
     def get_sortable_by(self, request: HttpRequest) -> Union[List[Callable], List[str], Tuple]: ...
     def lookup_allowed(self, lookup: str, value: str) -> bool: ...
     def to_field_allowed(self, request: HttpRequest, to_field: str) -> bool: ...
-    def has_add_permission(self, request: HttpRequest) -> bool: ...
+    def has_add_permission(self, request: HttpRequest, obj: Optional[Model] = ...) -> bool: ...
     def has_change_permission(self, request: HttpRequest, obj: Optional[Model] = ...) -> bool: ...
     def has_delete_permission(self, request: HttpRequest, obj: Optional[Model] = ...) -> bool: ...
     def has_view_permission(self, request: HttpRequest, obj: Optional[Model] = ...) -> bool: ...
     def has_module_permission(self, request: HttpRequest) -> bool: ...
 
 class ModelAdmin(BaseModelAdmin):
+    formfield_overrides: Any
     list_display: Sequence[Union[str, Callable]] = ...
     list_display_links: Optional[Sequence[Union[str, Callable]]] = ...
     list_filter: Sequence[Union[str, Type[ListFilter], Tuple[str, Type[ListFilter]]]] = ...
@@ -120,6 +122,7 @@ class ModelAdmin(BaseModelAdmin):
     actions_on_top: bool = ...
     actions_on_bottom: bool = ...
     actions_selection_counter: bool = ...
+    checks_class: Any = ...
     model: Type[Model] = ...
     opts: Options = ...
     admin_site: AdminSite = ...

django-stubs/contrib/admin/sites.pyi

@@ -1,11 +1,11 @@
-from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type, Union
+from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
 
 from django.contrib.admin.options import ModelAdmin
 from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
 from django.http.response import HttpResponse
 from django.template.response import TemplateResponse
-from django.urls.resolvers import URLResolver
+from django.urls.resolvers import URLPattern, URLResolver
 from django.utils.functional import LazyObject
 
 all_sites: Any
@@ -31,11 +31,11 @@ class AdminSite:
     def check(self, app_configs: None) -> List[Any]: ...
     def register(
         self,
-        model_or_iterable: Union[Type[Model], Iterable[Type[Model]]],
+        model_or_iterable: Union[List[Type[Model]], Tuple[Type[Model]], Type[Model]],
         admin_class: Optional[Type[ModelAdmin]] = ...,
         **options: Any
     ) -> None: ...
-    def unregister(self, model_or_iterable: Union[Type[Model], Iterable[Type[Model]]]) -> None: ...
+    def unregister(self, model_or_iterable: Type[Model]) -> None: ...
     def is_registered(self, model: Type[Model]) -> bool: ...
     def add_action(self, action: Callable, name: None = ...) -> None: ...
     def disable_action(self, name: str) -> None: ...

django-stubs/contrib/admin/templatetags/admin_list.pyi

@@ -27,7 +27,7 @@ class ResultList(list):
 def results(cl: ChangeList) -> Iterator[ResultList]: ...
 def result_hidden_fields(cl: ChangeList) -> Iterator[BoundField]: ...
 def result_list(
-    cl: ChangeList,
+    cl: ChangeList
 ) -> Dict[
     str, Union[List[Dict[str, Optional[Union[int, str]]]], List[ResultList], List[BoundField], ChangeList, int]
 ]: ...

django-stubs/contrib/admin/templatetags/admin_modify.pyi

@@ -1,6 +1,7 @@
-from typing import Any
+from typing import Any, Optional
 
 from django.contrib.admin.helpers import InlineAdminForm
+from django.contrib.admin.templatetags.base import InclusionAdminNode
 from django.template.base import Parser, Token
 from django.template.context import Context, RequestContext
 

django-stubs/contrib/admin/templatetags/admin_static.pyi

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional
 
 register: Any
 

django-stubs/contrib/admin/views/decorators.pyi

@@ -1,7 +1,5 @@
-from typing import Callable, TypeVar, overload
+from typing import Any, Callable, Optional
 
-_C = TypeVar("_C", bound=Callable)
-@overload
-def staff_member_required(view_func: _C = ..., redirect_field_name: str = ..., login_url: str = ...) -> _C: ...
-@overload
-def staff_member_required(view_func: None = ..., redirect_field_name: str = ..., login_url: str = ...) -> Callable: ...
+def staff_member_required(
+    view_func: Optional[Callable] = ..., redirect_field_name: str = ..., login_url: str = ...
+) -> Callable: ...

django-stubs/contrib/admin/views/main.pyi

@@ -2,11 +2,7 @@ from collections import OrderedDict
 from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
 
 from django.contrib.admin.filters import ListFilter, SimpleListFilter
-from django.contrib.admin.options import (  # noqa: F401
-    ModelAdmin,
-    IS_POPUP_VAR as IS_POPUP_VAR,
-    TO_FIELD_VAR as TO_FIELD_VAR,
-)
+from django.contrib.admin.options import ModelAdmin, IS_POPUP_VAR as IS_POPUP_VAR, TO_FIELD_VAR as TO_FIELD_VAR
 from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
 from django.db.models.expressions import Combinable, CombinedExpression, OrderBy
@@ -81,7 +77,9 @@ class ChangeList:
     paginator: Any = ...
     def get_results(self, request: WSGIRequest) -> None: ...
     def get_ordering_field(self, field_name: Union[Callable, str]) -> Optional[Union[CombinedExpression, str]]: ...
-    def get_ordering(self, request: WSGIRequest, queryset: QuerySet) -> List[Union[OrderBy, Combinable, str]]: ...
+    def get_ordering(
+        self, request: WSGIRequest, queryset: QuerySet
+    ) -> Union[List[Union[Combinable, str]], List[Union[OrderBy, str]]]: ...
     def get_ordering_field_columns(self) -> OrderedDict: ...
     def get_queryset(self, request: WSGIRequest) -> QuerySet: ...
     def apply_select_related(self, qs: QuerySet) -> QuerySet: ...

django-stubs/contrib/admindocs/views.pyi

@@ -3,17 +3,46 @@ from typing import Any, Optional, Union
 from django.db.models.fields import Field
 from django.views.generic import TemplateView
 
+from .utils import get_view_name
+
 MODEL_METHODS_EXCLUDE: Any
 
-class BaseAdminDocsView(TemplateView): ...
-class BookmarkletsView(BaseAdminDocsView): ...
-class TemplateTagIndexView(BaseAdminDocsView): ...
-class TemplateFilterIndexView(BaseAdminDocsView): ...
-class ViewIndexView(BaseAdminDocsView): ...
-class ViewDetailView(BaseAdminDocsView): ...
-class ModelIndexView(BaseAdminDocsView): ...
-class ModelDetailView(BaseAdminDocsView): ...
-class TemplateDetailView(BaseAdminDocsView): ...
+class BaseAdminDocsView(TemplateView):
+    template_name: str = ...
+    def dispatch(self, request: Any, *args: Any, **kwargs: Any): ...
+    def get_context_data(self, **kwargs: Any): ...
+
+class BookmarkletsView(BaseAdminDocsView):
+    template_name: str = ...
+    def get_context_data(self, **kwargs: Any): ...
+
+class TemplateTagIndexView(BaseAdminDocsView):
+    template_name: str = ...
+    def get_context_data(self, **kwargs: Any): ...
+
+class TemplateFilterIndexView(BaseAdminDocsView):
+    template_name: str = ...
+    def get_context_data(self, **kwargs: Any): ...
+
+class ViewIndexView(BaseAdminDocsView):
+    template_name: str = ...
+    def get_context_data(self, **kwargs: Any): ...
+
+class ViewDetailView(BaseAdminDocsView):
+    template_name: str = ...
+    def get_context_data(self, **kwargs: Any): ...
+
+class ModelIndexView(BaseAdminDocsView):
+    template_name: str = ...
+    def get_context_data(self, **kwargs: Any): ...
+
+class ModelDetailView(BaseAdminDocsView):
+    template_name: str = ...
+    def get_context_data(self, **kwargs: Any): ...
+
+class TemplateDetailView(BaseAdminDocsView):
+    template_name: str = ...
+    def get_context_data(self, **kwargs: Any): ...
 
 def get_return_data_type(func_name: Any): ...
 def get_readable_field_data_type(field: Union[Field, str]) -> str: ...

django-stubs/contrib/auth/backends.pyi

@@ -3,22 +3,20 @@ from typing import Any, Optional, Set, Union
 from django.contrib.auth.base_user import AbstractBaseUser
 from django.contrib.auth.models import AnonymousUser, User
 
-from django.db.models.base import Model
-
-_AnyUser = Union[Model, AnonymousUser]
-
 UserModel: Any
 
 class ModelBackend:
     def authenticate(
-        self, request: Any, username: Optional[str] = ..., password: Optional[str] = ..., **kwargs: Any
+        self, request: Any, username: Optional[Union[int, str]] = ..., password: Optional[str] = ..., **kwargs: Any
     ) -> Optional[AbstractBaseUser]: ...
-    def user_can_authenticate(self, user: Optional[_AnyUser]) -> bool: ...
-    def get_user_permissions(self, user_obj: _AnyUser, obj: Optional[Model] = ...) -> Set[str]: ...
-    def get_group_permissions(self, user_obj: _AnyUser, obj: Optional[Model] = ...) -> Set[str]: ...
-    def get_all_permissions(self, user_obj: _AnyUser, obj: Optional[Model] = ...) -> Set[str]: ...
-    def has_perm(self, user_obj: _AnyUser, perm: str, obj: Optional[Model] = ...) -> bool: ...
-    def has_module_perms(self, user_obj: _AnyUser, app_label: str) -> bool: ...
+    def user_can_authenticate(self, user: Optional[AbstractBaseUser]) -> bool: ...
+    def get_user_permissions(self, user_obj: AbstractBaseUser, obj: None = ...) -> Set[str]: ...
+    def get_group_permissions(self, user_obj: AbstractBaseUser, obj: None = ...) -> Set[str]: ...
+    def get_all_permissions(self, user_obj: AbstractBaseUser, obj: Optional[str] = ...) -> Set[str]: ...
+    def has_perm(
+        self, user_obj: Union[AbstractBaseUser, AnonymousUser], perm: str, obj: Optional[str] = ...
+    ) -> bool: ...
+    def has_module_perms(self, user_obj: Union[AbstractBaseUser, AnonymousUser], app_label: str) -> bool: ...
     def get_user(self, user_id: int) -> AbstractBaseUser: ...
 
 class AllowAllUsersModelBackend(ModelBackend): ...

django-stubs/contrib/auth/base_user.pyi

@@ -13,12 +13,14 @@ class BaseUserManager(models.Manager[_T]):
     def get_by_natural_key(self, username: Optional[str]) -> _T: ...
 
 class AbstractBaseUser(models.Model):
-    password = models.CharField(max_length=128)
-    last_login = models.DateTimeField(blank=True, null=True)
-
+    password: models.CharField = ...
+    last_login: models.DateTimeField = ...
+    is_active: models.BooleanField = ...
     REQUIRED_FIELDS: List[str] = ...
     class Meta: ...
     def get_username(self) -> str: ...
+    def clean(self) -> None: ...
+    def save(self, *args: Any, **kwargs: Any) -> None: ...
     def natural_key(self) -> Tuple[str]: ...
     @property
     def is_anonymous(self) -> bool: ...

django-stubs/contrib/auth/decorators.pyi

@@ -1,6 +1,6 @@
-from typing import Callable, List, Optional, Set, Union
+from typing import Any, Callable, List, Optional, Set, Union
 
-from django.contrib.auth import REDIRECT_FIELD_NAME as REDIRECT_FIELD_NAME  # noqa: F401
+from django.contrib.auth import REDIRECT_FIELD_NAME as REDIRECT_FIELD_NAME
 
 def user_passes_test(
     test_func: Callable, login_url: Optional[str] = ..., redirect_field_name: str = ...

django-stubs/contrib/auth/handlers/modwsgi.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any, Dict, Optional
 
 UserModel: Any
 

django-stubs/contrib/auth/management/commands/createsuperuser.pyi

@@ -1,4 +1,4 @@
-import getpass as getpass  # noqa: F401
+import getpass as getpass
 from typing import Any
 
 from django.core.management.base import BaseCommand

django-stubs/contrib/auth/mixins.pyi

@@ -23,6 +23,6 @@ class PermissionRequiredMixin(AccessMixin):
     def dispatch(self, request: http.HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: ...
 
 class UserPassesTestMixin(AccessMixin):
-    def test_func(self) -> Optional[bool]: ...
+    def test_func(self) -> None: ...
     def get_test_func(self) -> Callable: ...
     def dispatch(self, request: http.HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: ...

django-stubs/contrib/auth/models.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Collection, Optional, Set, Tuple, Type, TypeVar, Union
+from typing import Any, Collection, Optional, Set, Tuple, Type, TypeVar
 
 from django.contrib.auth.base_user import AbstractBaseUser as AbstractBaseUser, BaseUserManager as BaseUserManager
 from django.contrib.auth.validators import UnicodeUsernameValidator
@@ -8,30 +8,24 @@ from django.db.models.manager import EmptyManager
 
 from django.db import models
 
-_AnyUser = Union[Model, "AnonymousUser"]
-
 def update_last_login(sender: Type[AbstractBaseUser], user: AbstractBaseUser, **kwargs: Any) -> None: ...
 
-class PermissionManager(models.Manager["Permission"]):
+class PermissionManager(models.Manager):
     def get_by_natural_key(self, codename: str, app_label: str, model: str) -> Permission: ...
 
 class Permission(models.Model):
     content_type_id: int
-    objects: PermissionManager
-
-    name = models.CharField(max_length=255)
-    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
-    codename = models.CharField(max_length=100)
+    name: models.CharField = ...
+    content_type: models.ForeignKey = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+    codename: models.CharField = ...
     def natural_key(self) -> Tuple[str, str, str]: ...
 
-class GroupManager(models.Manager["Group"]):
+class GroupManager(models.Manager):
     def get_by_natural_key(self, name: str) -> Group: ...
 
 class Group(models.Model):
-    objects: GroupManager
-
-    name = models.CharField(max_length=150)
-    permissions = models.ManyToManyField(Permission)
+    name: models.CharField = ...
+    permissions: models.ManyToManyField = models.ManyToManyField(Permission)
     def natural_key(self): ...
 
 _T = TypeVar("_T", bound=Model)
@@ -45,28 +39,26 @@ class UserManager(BaseUserManager[_T]):
     ) -> _T: ...
 
 class PermissionsMixin(models.Model):
-    is_superuser = models.BooleanField()
-    groups = models.ManyToManyField(Group)
-    user_permissions = models.ManyToManyField(Permission)
-    def get_group_permissions(self, obj: Optional[_AnyUser] = ...) -> Set[str]: ...
-    def get_all_permissions(self, obj: Optional[_AnyUser] = ...) -> Set[str]: ...
-    def has_perm(self, perm: str, obj: Optional[_AnyUser] = ...) -> bool: ...
-    def has_perms(self, perm_list: Collection[str], obj: Optional[_AnyUser] = ...) -> bool: ...
+    is_superuser: models.BooleanField = ...
+    groups: models.ManyToManyField = models.ManyToManyField(Group)
+    user_permissions: models.ManyToManyField = models.ManyToManyField(Permission)
+    def get_group_permissions(self, obj: None = ...) -> Set[str]: ...
+    def get_all_permissions(self, obj: Optional[str] = ...) -> Set[str]: ...
+    def has_perm(self, perm: str, obj: Optional[str] = ...) -> bool: ...
+    def has_perms(self, perm_list: Collection[str], obj: None = ...) -> bool: ...
     def has_module_perms(self, app_label: str) -> bool: ...
 
 class AbstractUser(AbstractBaseUser, PermissionsMixin):  # type: ignore
     username_validator: UnicodeUsernameValidator = ...
-
-    username = models.CharField(max_length=150)
-    first_name = models.CharField(max_length=30, blank=True)
-    last_name = models.CharField(max_length=150, blank=True)
-    email = models.EmailField(blank=True)
-    is_staff = models.BooleanField()
-    is_active = models.BooleanField()
-    date_joined = models.DateTimeField()
-
+    username: models.CharField = ...
+    first_name: models.CharField = ...
+    last_name: models.CharField = ...
+    email: models.EmailField = ...
+    is_staff: models.BooleanField = ...
+    date_joined: models.DateTimeField = ...
     EMAIL_FIELD: str = ...
     USERNAME_FIELD: str = ...
+    def clean(self) -> None: ...
     def get_full_name(self) -> str: ...
     def get_short_name(self) -> str: ...
     def email_user(self, subject: str, message: str, from_email: str = ..., **kwargs: Any) -> None: ...
@@ -88,10 +80,10 @@ class AnonymousUser:
     def groups(self) -> EmptyManager: ...
     @property
     def user_permissions(self) -> EmptyManager: ...
-    def get_group_permissions(self, obj: Optional[_AnyUser] = ...) -> Set[Any]: ...
-    def get_all_permissions(self, obj: Optional[_AnyUser] = ...) -> Set[str]: ...
-    def has_perm(self, perm: str, obj: Optional[_AnyUser] = ...) -> bool: ...
-    def has_perms(self, perm_list: Collection[str], obj: Optional[_AnyUser] = ...) -> bool: ...
+    def get_group_permissions(self, obj: None = ...) -> Set[Any]: ...
+    def get_all_permissions(self, obj: Any = ...) -> Set[str]: ...
+    def has_perm(self, perm: str, obj: None = ...) -> bool: ...
+    def has_perms(self, perm_list: Collection[str], obj: None = ...) -> bool: ...
     def has_module_perms(self, module: str) -> bool: ...
     @property
     def is_anonymous(self) -> bool: ...

django-stubs/contrib/auth/password_validation.pyi

@@ -1,6 +1,7 @@
 from pathlib import Path, PosixPath
 from typing import Any, List, Mapping, Optional, Protocol, Sequence, Set, Union
 
+from django.contrib.auth.base_user import AbstractBaseUser
 from django.db.models.base import Model
 
 _UserModel = Model

django-stubs/contrib/contenttypes/checks.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List
+from typing import Any, List, Optional
 
 def check_generic_foreign_keys(app_configs: None = ..., **kwargs: Any) -> List[Any]: ...
 def check_model_name_lengths(app_configs: None = ..., **kwargs: Any) -> List[Any]: ...

django-stubs/contrib/contenttypes/fields.pyi

@@ -1,19 +1,19 @@
-from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
+from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union, Generic
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.checks.messages import Error
 from django.db.models.base import Model
-from django.db.models.expressions import Combinable
-from django.db.models.fields.mixins import FieldCacheMixin
 from django.db.models.fields.related import ForeignObject
 from django.db.models.fields.related_descriptors import ReverseManyToOneDescriptor
 from django.db.models.fields.reverse_related import ForeignObjectRel
+
+from django.db.models.expressions import Combinable
+from django.db.models.fields import Field, PositiveIntegerField
+from django.db.models.fields.mixins import FieldCacheMixin
 from django.db.models.query import QuerySet
 from django.db.models.query_utils import FilteredRelation, PathInfo
 from django.db.models.sql.where import WhereNode
 
-from django.db.models.fields import Field, PositiveIntegerField
-
 class GenericForeignKey(FieldCacheMixin):
     # django-stubs implementation only fields
     _pyi_private_set_type: Union[Any, Combinable]

django-stubs/contrib/contenttypes/views.pyi

@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Any, Optional, Union
 
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseRedirect

django-stubs/contrib/flatpages/views.pyi

@@ -1,3 +1,5 @@
+from typing import Any, Optional
+
 from django.contrib.flatpages.models import FlatPage
 from django.core.handlers.wsgi import WSGIRequest
 from django.http.response import HttpResponse

django-stubs/contrib/gis/db/models/__init__.pyi

@@ -1,13 +0,0 @@
-from django.db.models import *
-
-from .fields import (
-    GeometryField as GeometryField,
-    LineStringField as LineStringField,
-    MultiLineStringField as MultiLineStringField,
-    MultiPointField as MultiPointField,
-    MultiPolygonField as MultiPolygonField,
-    PointField as PointField,
-    PolygonField as PolygonField,
-    GeometryCollectionField as GeometryCollectionField,
-    RasterField as RasterField,
-)

django-stubs/contrib/gis/db/models/fields.pyi

@@ -1,91 +0,0 @@
-from typing import Any, Iterable, NamedTuple, Optional, TypeVar, Union, Tuple
-
-from django.db.models.fields import Field, _ErrorMessagesToOverride, _FieldChoices, _ValidatorCallable
-
-_Connection = Any
-
-# __set__ value type
-_ST = TypeVar("_ST")
-# __get__ return type
-_GT = TypeVar("_GT")
-
-class SRIDCacheEntry(NamedTuple):
-    units: Any
-    units_name: str
-    geodetic: bool
-    spheroid: str
-
-def get_srid_info(srid: int, connection: _Connection) -> SRIDCacheEntry: ...
-
-class BaseSpatialField(Field[_ST, _GT]):
-    def __init__(
-        self,
-        verbose_name: Optional[Union[str, bytes]] = ...,
-        srid: int = ...,
-        spatial_index: bool = ...,
-        name: Optional[str] = ...,
-        primary_key: bool = ...,
-        max_length: Optional[int] = ...,
-        unique: bool = ...,
-        blank: bool = ...,
-        null: bool = ...,
-        db_index: bool = ...,
-        default: Any = ...,
-        editable: bool = ...,
-        auto_created: bool = ...,
-        serialize: bool = ...,
-        unique_for_date: Optional[str] = ...,
-        unique_for_month: Optional[str] = ...,
-        unique_for_year: Optional[str] = ...,
-        choices: Optional[_FieldChoices] = ...,
-        help_text: str = ...,
-        db_column: Optional[str] = ...,
-        db_tablespace: Optional[str] = ...,
-        validators: Iterable[_ValidatorCallable] = ...,
-        error_messages: Optional[_ErrorMessagesToOverride] = ...,
-    ): ...
-    def spheroid(self, connection: _Connection) -> str: ...
-    def units(self, connection: _Connection) -> Any: ...
-    def units_name(self, connection: _Connection) -> str: ...
-    def geodetic(self, connection: _Connection) -> bool: ...
-
-class GeometryField(BaseSpatialField):
-    def __init__(
-        self,
-        verbose_name: Optional[Union[str, bytes]] = ...,
-        dim: int = ...,
-        geography: bool = ...,
-        extent: Tuple[float, float, float, float] = ...,
-        tolerance: float = ...,
-        srid: int = ...,
-        spatial_index: bool = ...,
-        name: Optional[str] = ...,
-        primary_key: bool = ...,
-        max_length: Optional[int] = ...,
-        unique: bool = ...,
-        blank: bool = ...,
-        null: bool = ...,
-        db_index: bool = ...,
-        default: Any = ...,
-        editable: bool = ...,
-        auto_created: bool = ...,
-        serialize: bool = ...,
-        unique_for_date: Optional[str] = ...,
-        unique_for_month: Optional[str] = ...,
-        unique_for_year: Optional[str] = ...,
-        choices: Optional[_FieldChoices] = ...,
-        help_text: str = ...,
-        db_column: Optional[str] = ...,
-        db_tablespace: Optional[str] = ...,
-        validators: Iterable[_ValidatorCallable] = ...,
-        error_messages: Optional[_ErrorMessagesToOverride] = ...,
-    ): ...
-
-class PointField(GeometryField): ...
-class LineStringField(GeometryField): ...
-class PolygonField(GeometryField): ...
-class MultiPointField(GeometryField): ...
-class MultiLineStringField(GeometryField): ...
-class MultiPolygonField(GeometryField): ...
-class GeometryCollectionField(GeometryField): ...
-class RasterField(BaseSpatialField): ...

django-stubs/contrib/messages/context_processors.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Optional, Union
 
 from django.contrib.messages.storage.base import BaseStorage
 from django.http.request import HttpRequest

django-stubs/contrib/messages/storage/base.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List, Optional
+from typing import Any, List, Optional, Union
 
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase

django-stubs/contrib/messages/utils.pyi

@@ -1,3 +1,3 @@
-from typing import Dict
+from typing import Dict, Optional
 
 def get_level_tags() -> Dict[int, str]: ...

django-stubs/contrib/messages/views.pyi

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Any, Dict, Optional
 
 from django.forms.forms import BaseForm
 from django.http.response import HttpResponse

django-stubs/contrib/postgres/aggregates/__init__.pyi

@@ -1,24 +0,0 @@
-from .general import (
-    ArrayAgg as ArrayAgg,
-    BitAnd as BitAnd,
-    BitOr as BitOr,
-    BoolAnd as BoolAnd,
-    BoolOr as BoolOr,
-    JSONBAgg as JSONBAgg,
-    StringAgg as StringAgg,
-)
-
-from .statistics import (
-    Corr as Corr,
-    CovarPop as CovarPop,
-    RegrAvgX as RegrAvgX,
-    RegrAvgY as RegrAvgY,
-    RegrCount as RegrCount,
-    RegrIntercept as RegrIntercept,
-    RegrR2 as RegrR2,
-    RegrSlope as RegrSlope,
-    RegrSXX as RegrSXX,
-    RegrSXY as RegrSXY,
-    RegrSYY as RegrSYY,
-    StatAggregate as StatAggregate,
-)

django-stubs/contrib/postgres/aggregates/general.pyi

@@ -1,11 +0,0 @@
-from django.db.models.aggregates import Aggregate
-
-from .mixins import OrderableAggMixin
-
-class ArrayAgg(OrderableAggMixin, Aggregate): ...
-class BitAnd(Aggregate): ...
-class BitOr(Aggregate): ...
-class BoolAnd(Aggregate): ...
-class BoolOr(Aggregate): ...
-class JSONBAgg(Aggregate): ...
-class StringAgg(OrderableAggMixin, Aggregate): ...

django-stubs/contrib/postgres/aggregates/mixins.pyi

@@ -1 +0,0 @@
-class OrderableAggMixin: ...

django-stubs/contrib/postgres/aggregates/statistics.pyi

@@ -1,14 +0,0 @@
-from django.db.models.aggregates import Aggregate
-
-class StatAggregate(Aggregate): ...
-class Corr(StatAggregate): ...
-class CovarPop(StatAggregate): ...
-class RegrAvgX(StatAggregate): ...
-class RegrAvgY(StatAggregate): ...
-class RegrCount(StatAggregate): ...
-class RegrIntercept(StatAggregate): ...
-class RegrR2(StatAggregate): ...
-class RegrSlope(StatAggregate): ...
-class RegrSXX(StatAggregate): ...
-class RegrSXY(StatAggregate): ...
-class RegrSYY(StatAggregate): ...

django-stubs/contrib/postgres/indexes.pyi

@@ -1,82 +1,29 @@
-from typing import Optional, Sequence
-
-from django.db.models.query_utils import Q
+from typing import Any, Optional
 
 from django.db.models import Index
 
-class PostgresIndex(Index): ...
+class PostgresIndex(Index):
+    @property
+    def max_name_length(self) -> int: ...
 
 class BrinIndex(PostgresIndex):
     def __init__(
-        self,
-        *,
-        autosummarize: Optional[bool] = ...,
-        pages_per_range: Optional[int] = ...,
-        fields: Sequence[str] = ...,
-        name: Optional[str] = ...,
-        db_tablespace: Optional[str] = ...,
-        opclasses: Sequence[str] = ...,
-        condition: Optional[Q] = ...
+        self, *, autosummarize: Optional[bool] = ..., pages_per_range: Optional[int] = ..., **kwargs: Any
     ) -> None: ...
 
 class BTreeIndex(PostgresIndex):
-    def __init__(
-        self,
-        *,
-        fillfactor: Optional[int] = ...,
-        fields: Sequence[str] = ...,
-        name: Optional[str] = ...,
-        db_tablespace: Optional[str] = ...,
-        opclasses: Sequence[str] = ...,
-        condition: Optional[Q] = ...
-    ) -> None: ...
+    def __init__(self, *, fillfactor: Optional[int] = ..., **kwargs: Any): ...
 
 class GinIndex(PostgresIndex):
     def __init__(
-        self,
-        *,
-        fastupdate: Optional[bool] = ...,
-        gin_pending_list_limit: Optional[int] = ...,
-        fields: Sequence[str] = ...,
-        name: Optional[str] = ...,
-        db_tablespace: Optional[str] = ...,
-        opclasses: Sequence[str] = ...,
-        condition: Optional[Q] = ...
+        self, *, fastupdate: Optional[bool] = ..., gin_pending_list_limit: Optional[int] = ..., **kwargs: Any
     ) -> None: ...
 
 class GistIndex(PostgresIndex):
-    def __init__(
-        self,
-        *,
-        buffering: Optional[bool] = ...,
-        fillfactor: Optional[int] = ...,
-        fields: Sequence[str] = ...,
-        name: Optional[str] = ...,
-        db_tablespace: Optional[str] = ...,
-        opclasses: Sequence[str] = ...,
-        condition: Optional[Q] = ...
-    ) -> None: ...
+    def __init__(self, *, buffering: Optional[bool] = ..., fillfactor: Optional[int] = ..., **kwargs: Any) -> None: ...
 
 class HashIndex(PostgresIndex):
-    def __init__(
-        self,
-        *,
-        fillfactor: Optional[int] = ...,
-        fields: Sequence[str] = ...,
-        name: Optional[str] = ...,
-        db_tablespace: Optional[str] = ...,
-        opclasses: Sequence[str] = ...,
-        condition: Optional[Q] = ...
-    ) -> None: ...
+    def __init__(self, *, fillfactor: Optional[int] = ..., **kwargs: Any) -> None: ...
 
 class SpGistIndex(PostgresIndex):
-    def __init__(
-        self,
-        *,
-        fillfactor: Optional[int] = ...,
-        fields: Sequence[str] = ...,
-        name: Optional[str] = ...,
-        db_tablespace: Optional[str] = ...,
-        opclasses: Sequence[str] = ...,
-        condition: Optional[Q] = ...
-    ) -> None: ...
+    def __init__(self, *, fillfactor: Optional[int] = ..., **kwargs: Any) -> None: ...

django-stubs/contrib/postgres/lookups.pyi

@@ -1,18 +0,0 @@
-from django.db.models.lookups import Exact
-
-from django.db.models import Lookup, Transform
-from .search import SearchVectorExact
-
-class PostgresSimpleLookup(Lookup):
-    operator: str
-
-class DataContains(PostgresSimpleLookup): ...
-class ContainedBy(PostgresSimpleLookup): ...
-class Overlap(PostgresSimpleLookup): ...
-class HasKey(PostgresSimpleLookup): ...
-class HasKeys(PostgresSimpleLookup): ...
-class HasAnyKeys(HasKeys): ...
-class Unaccent(Transform): ...
-class SearchLookup(SearchVectorExact): ...
-class TrigramSimilar(PostgresSimpleLookup): ...
-class JSONExact(Exact): ...

django-stubs/contrib/postgres/search.pyi

@@ -1,12 +1,10 @@
 from typing import Any, Dict, Optional, TypeVar, Union
 
-from django.db.models.expressions import Combinable, CombinedExpression, Func, Value, _OutputField
+from django.db.models.expressions import Combinable, CombinedExpression, Func, Value
 from django.db.models.lookups import Lookup
 
 from django.db.models import Field
 
-_Expression = Union[str, Combinable, "SearchQueryCombinable"]
-
 class SearchVectorExact(Lookup): ...
 class SearchVectorField(Field): ...
 class SearchQueryField(Field): ...
@@ -16,12 +14,10 @@ class SearchVectorCombinable:
 
 class SearchVector(SearchVectorCombinable, Func):
     config: Optional[Any] = ...
-    def __init__(self, *expressions: _Expression, **extra: Any): ...
+    def __init__(self, *expressions: Union[str, Combinable], **extra: Any): ...
 
 class CombinedSearchVector(SearchVectorCombinable, CombinedExpression):
-    def __init__(
-        self, lhs, connector, rhs, config: Optional[_Expression] = ..., output_field: Optional[_OutputField] = ...
-    ): ...
+    def __init__(self, lhs, connector, rhs, config, output_field: Optional[Field, str] = ...): ...
 
 _T = TypeVar("_T", bound="SearchQueryCombinable")
 
@@ -33,31 +29,19 @@ class SearchQueryCombinable:
     def __and__(self: _T, other: SearchQueryCombinable) -> _T: ...
     def __rand__(self: _T, other: SearchQueryCombinable) -> _T: ...
 
-class SearchQuery(SearchQueryCombinable, Value):  # type: ignore
-    SEARCH_TYPES: Dict[str, str] = ...
-    def __init__(
-        self,
-        value: str,
-        output_field: Optional[_OutputField] = ...,
-        *,
-        config: Optional[_Expression] = ...,
-        invert: bool = ...,
-        search_type: str = ...
-    ): ...
+class SearchQuery(SearchQueryCombinable, Value):
+    SEARCH_TYPES: Dict[str, str] = {"plain": "plainto_tsquery", "phrase": "phraseto_tsquery", "raw": "to_tsquery"}
+    def __init__(self, value, output_field=..., *, config=..., invert=False, search_type="plain"): ...
     def __invert__(self: _T) -> _T: ...
 
-class CombinedSearchQuery(SearchQueryCombinable, CombinedExpression):  # type: ignore
-    def __init__(
-        self, lhs, connector, rhs, config: Optional[_Expression] = ..., output_field: Optional[_OutputField] = ...
-    ) -> None: ...
+class CombinedSearchQuery(SearchQueryCombinable, CombinedExpression):
+    def __init__(self, lhs, connector, rhs, config, output_field=...) -> None: ...
 
 class SearchRank(Func):
-    def __init__(
-        self, vector: Union[SearchVector, _Expression], query: Union[SearchQuery, _Expression], **extra: Any
-    ) -> None: ...
+    def __init__(self, vector, query, **extra: Any) -> None: ...
 
 class TrigramBase(Func):
-    def __init__(self, expression: _Expression, string, **extra: Any) -> None: ...
+    def __init__(self, expression, string, **extra: Any) -> None: ...
 
 class TrigramSimilarity(TrigramBase): ...
 class TrigramDistance(TrigramBase): ...

django-stubs/contrib/sites/models.pyi

@@ -6,16 +6,15 @@ from django.db import models
 
 SITE_CACHE: Any
 
-class SiteManager(models.Manager["Site"]):
+class SiteManager(models.Manager):
     def get_current(self, request: Optional[HttpRequest] = ...) -> Site: ...
     def clear_cache(self) -> None: ...
     def get_by_natural_key(self, domain: str) -> Site: ...
 
 class Site(models.Model):
-    objects: SiteManager
-
-    domain = models.CharField(max_length=100)
-    name = models.CharField(max_length=50)
+    domain: models.CharField = ...
+    name: models.CharField = ...
+    objects: SiteManager = ...
     def natural_key(self) -> Tuple[str]: ...
 
 def clear_site_cache(sender: Type[Site], **kwargs: Any) -> None: ...

django-stubs/contrib/staticfiles/checks.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List
+from typing import Any, List, Optional
 
 from django.core.checks.messages import Error
 

django-stubs/contrib/staticfiles/finders.pyi

@@ -37,7 +37,7 @@ def get_finders() -> Iterator[BaseFinder]: ...
 def get_finder(import_path: Literal["django.contrib.staticfiles.finders.FileSystemFinder"]) -> FileSystemFinder: ...
 @overload
 def get_finder(
-    import_path: Literal["django.contrib.staticfiles.finders.AppDirectoriesFinder"],
+    import_path: Literal["django.contrib.staticfiles.finders.AppDirectoriesFinder"]
 ) -> AppDirectoriesFinder: ...
 @overload
 def get_finder(import_path: str) -> BaseFinder: ...

django-stubs/contrib/staticfiles/storage.pyi

@@ -4,6 +4,7 @@ from typing import Any, Callable, Iterator, Optional, Tuple
 from django.core.files.base import File
 from django.core.files.storage import FileSystemStorage
 from django.utils.functional import LazyObject
+from django.utils.safestring import SafeText
 
 class StaticFilesStorage(FileSystemStorage):
     base_location: Any = ...

django-stubs/contrib/staticfiles/templatetags/staticfiles.pyi

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional
 
 from django.template.base import Parser, Token
 from django.templatetags.static import StaticNode

django-stubs/contrib/staticfiles/testing.pyi

@@ -1,3 +0,0 @@
-from django.test import LiveServerTestCase
-
-class StaticLiveServerTestCase(LiveServerTestCase): ...

django-stubs/contrib/staticfiles/utils.pyi

@@ -1,5 +1,5 @@
 from collections import OrderedDict
-from typing import Iterator, List, Optional, Tuple, Union
+from typing import Any, Iterator, List, Optional, Tuple, Union
 
 from django.core.files.storage import FileSystemStorage
 

django-stubs/contrib/staticfiles/views.pyi

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional
 
 from django.core.handlers.wsgi import WSGIRequest
 from django.http.response import FileResponse

django-stubs/contrib/syndication/views.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.handlers.wsgi import WSGIRequest

django-stubs/core/checks/caches.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List
+from typing import Any, List, Optional
 
 from django.core.checks.messages import Error
 

django-stubs/core/checks/database.pyi

@@ -1,3 +1,3 @@
-from typing import Any, List
+from typing import Any, List, Optional
 
 def check_database_backends(*args: Any, **kwargs: Any) -> List[Any]: ...

django-stubs/core/checks/registry.pyi

@@ -12,7 +12,6 @@ class Tags:
     security: str = ...
     signals: str = ...
     templates: str = ...
-    translation: str = ...
     urls: str = ...
 
 class CheckRegistry:

django-stubs/core/checks/security/base.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List
+from typing import Any, List, Optional
 
 from django.core.checks.messages import Warning
 

django-stubs/core/checks/security/csrf.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List
+from typing import Any, List, Optional
 
 from django.core.checks.messages import Warning
 

django-stubs/core/checks/security/sessions.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List
+from typing import Any, List, Optional
 
 from django.core.checks.messages import Warning
 

django-stubs/core/checks/templates.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List
+from typing import Any, List, Optional
 
 from django.core.checks.messages import Error
 

django-stubs/core/checks/urls.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Callable, List, Tuple, Union
+from typing import Any, Callable, List, Optional, Tuple, Union
 
 from django.core.checks.messages import CheckMessage, Error, Warning
 from django.urls.resolvers import URLPattern, URLResolver

django-stubs/core/files/base.pyi

@@ -14,7 +14,6 @@ class File(FileProxyMixin, IO[Any]):
     def __init__(self, file: Any, name: Optional[str] = ...) -> None: ...
     def __bool__(self) -> bool: ...
     def __len__(self) -> int: ...
-    @property
     def size(self) -> int: ...
     def chunks(self, chunk_size: Optional[int] = ...) -> Iterator[bytes]: ...
     def multiple_chunks(self, chunk_size: Optional[int] = ...) -> bool: ...

django-stubs/core/files/uploadhandler.pyi

@@ -8,8 +8,8 @@ from django.utils.datastructures import MultiValueDict
 class UploadFileException(Exception): ...
 
 class StopUpload(UploadFileException):
-    connection_reset: bool = ...
-    def __init__(self, connection_reset: bool = ...) -> None: ...
+    connection_reset = ...  # type: bool
+    def __init__(self, connection_reset: bool = False) -> None: ...
 
 class SkipFile(UploadFileException): ...
 class StopFutureHandlers(UploadFileException): ...

django-stubs/core/mail/backends/base.pyi

@@ -1,5 +1,5 @@
 import types
-from typing import Any, TypeVar, Type, Iterable, Optional
+from typing import Any, TypeVar, Type, Iterable
 
 from django.core.mail.message import EmailMessage
 
@@ -7,7 +7,7 @@ _T = TypeVar("_T", bound="BaseEmailBackend")
 
 class BaseEmailBackend:
     def __init__(self, fail_silently: bool = ..., **kwargs: Any) -> None: ...
-    def open(self) -> Optional[bool]: ...
+    def open(self) -> bool: ...
     def close(self) -> None: ...
     def __enter__(self: _T) -> _T: ...
     def __exit__(

django-stubs/core/mail/backends/console.pyi

@@ -1,3 +0,0 @@
-from django.core.mail.backends.base import BaseEmailBackend
-
-class EmailBackend(BaseEmailBackend): ...

django-stubs/core/mail/backends/dummy.pyi

@@ -1,3 +0,0 @@
-from django.core.mail.backends.base import BaseEmailBackend
-
-class EmailBackend(BaseEmailBackend): ...

django-stubs/core/mail/backends/filebased.pyi

@@ -1,3 +0,0 @@
-from django.core.mail.backends.base import BaseEmailBackend
-
-class EmailBackend(BaseEmailBackend): ...

django-stubs/core/mail/backends/locmem.pyi

@@ -1,3 +0,0 @@
-from django.core.mail.backends.base import BaseEmailBackend
-
-class EmailBackend(BaseEmailBackend): ...

django-stubs/core/mail/backends/smtp.pyi

@@ -1,18 +0,0 @@
-import smtplib
-import threading
-from typing import Optional, Union
-
-from django.core.mail.backends.base import BaseEmailBackend
-
-class EmailBackend(BaseEmailBackend):
-    host: str = ...
-    port: int = ...
-    username: str = ...
-    password: str = ...
-    use_tls: bool = ...
-    use_ssl: bool = ...
-    timeout: Optional[int] = ...
-    ssl_keyfile: Optional[str] = ...
-    ssl_certfile: Optional[str] = ...
-    connection: Union[smtplib.SMTP_SSL, smtplib.SMTP, None] = ...
-    _lock: threading.RLock = ...

django-stubs/core/mail/message.pyi

@@ -1,10 +1,8 @@
 from email._policybase import Policy  # type: ignore
-from email.message import Message
-from email.mime.base import MIMEBase
 from email.mime.message import MIMEMessage
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
-from typing import Any, Dict, List, Optional, Sequence, Tuple, Union, overload
+from typing import Any, Dict, List, Optional, Sequence, Tuple, Union
 
 utf8_charset: Any
 utf8_charset_qp: Any
@@ -45,11 +43,6 @@ class SafeMIMEMultipart(MIMEMixin, MIMEMultipart):
         self, _subtype: str = ..., boundary: None = ..., _subparts: None = ..., encoding: str = ..., **_params: Any
     ) -> None: ...
 
-_AttachmentContent = Union[bytes, EmailMessage, Message, SafeMIMEText, str]
-_AttachmentTuple = Union[
-    Tuple[str, _AttachmentContent], Tuple[Optional[str], _AttachmentContent, str], Tuple[str, _AttachmentContent, None]
-]
-
 class EmailMessage:
     content_subtype: str = ...
     mixed_subtype: str = ...
@@ -69,42 +62,42 @@ class EmailMessage:
         subject: str = ...,
         body: Optional[str] = ...,
         from_email: Optional[str] = ...,
-        to: Optional[Sequence[str]] = ...,
-        bcc: Optional[Sequence[str]] = ...,
+        to: Optional[Union[Sequence[str], str]] = ...,
+        bcc: Optional[Union[Sequence[str], str]] = ...,
         connection: Optional[Any] = ...,
-        attachments: Optional[Sequence[Union[MIMEBase, _AttachmentTuple]]] = ...,
+        attachments: Optional[Union[List[Tuple[str, Union[str, bytes], str]], List[MIMEText]]] = ...,
         headers: Optional[Dict[str, str]] = ...,
-        cc: Optional[Sequence[str]] = ...,
-        reply_to: Optional[Sequence[str]] = ...,
+        cc: Optional[Union[Sequence[str], str]] = ...,
+        reply_to: Optional[Union[List[Optional[str]], str]] = ...,
     ) -> None: ...
     def get_connection(self, fail_silently: bool = ...) -> Any: ...
     # TODO: when typeshed gets more types for email.Message, move it to MIMEMessage, now it has too many false-positives
     def message(self) -> Any: ...
     def recipients(self) -> List[str]: ...
     def send(self, fail_silently: bool = ...) -> int: ...
-    @overload
-    def attach(self, filename: MIMEText = ...) -> None: ...
-    @overload
-    def attach(self, filename: None = ..., content: _AttachmentContent = ..., mimetype: str = ...) -> None: ...
-    @overload
-    def attach(self, filename: str = ..., content: _AttachmentContent = ..., mimetype: Optional[str] = ...) -> None: ...
+    def attach(
+        self,
+        filename: Optional[Union[MIMEText, str]] = ...,
+        content: Optional[Union[bytes, EmailMessage, SafeMIMEText, str]] = ...,
+        mimetype: Optional[str] = ...,
+    ) -> None: ...
     def attach_file(self, path: str, mimetype: Optional[str] = ...) -> None: ...
 
 class EmailMultiAlternatives(EmailMessage):
     alternative_subtype: str = ...
-    alternatives: Sequence[Tuple[_AttachmentContent, str]] = ...
+    alternatives: Any = ...
     def __init__(
         self,
         subject: str = ...,
         body: str = ...,
         from_email: Optional[str] = ...,
-        to: Optional[Sequence[str]] = ...,
-        bcc: Optional[Sequence[str]] = ...,
+        to: Optional[List[str]] = ...,
+        bcc: Optional[List[str]] = ...,
         connection: Optional[Any] = ...,
-        attachments: Optional[Sequence[Union[MIMEBase, _AttachmentTuple]]] = ...,
+        attachments: None = ...,
         headers: Optional[Dict[str, str]] = ...,
-        alternatives: Optional[Sequence[Tuple[_AttachmentContent, str]]] = ...,
-        cc: Optional[Sequence[str]] = ...,
-        reply_to: Optional[Sequence[str]] = ...,
+        alternatives: Optional[List[Tuple[str, str]]] = ...,
+        cc: None = ...,
+        reply_to: None = ...,
     ) -> None: ...
-    def attach_alternative(self, content: _AttachmentContent, mimetype: str) -> None: ...
+    def attach_alternative(self, content: str, mimetype: str) -> None: ...

django-stubs/core/management/base.pyi

@@ -63,7 +63,7 @@ class BaseCommand:
         fail_level: int = ...,
     ) -> None: ...
     def check_migrations(self) -> None: ...
-    def handle(self, *args: Any, **options: Any) -> Optional[str]: ...
+    def handle(self, *args: Any, **options: Any) -> None: ...
 
 class AppCommand(BaseCommand):
     missing_args_message: str = ...

django-stubs/core/management/color.pyi

@@ -1,3 +1,5 @@
+from collections import Callable
+
 def supports_color() -> bool: ...
 
 class Style:

django-stubs/core/management/commands/makemessages.pyi

@@ -1,6 +1,13 @@
-from typing import Any, Optional, Pattern, Type
+import os
+import re
+from typing import Any, Pattern, Type, Optional
 
 from django.core.management.base import BaseCommand
+from django.utils.functional import cached_property
+from django.utils.jslex import prepare_js_for_gettext
+
+from django.conf import settings
+from django.utils.translation import templatize
 
 plural_forms_re: Pattern = ...
 STATUS_OK: int = ...

django-stubs/core/paginator.pyi

@@ -1,4 +1,4 @@
-from typing import Dict, List, Optional, Protocol, Sequence, Union
+from typing import Dict, List, Optional, Union, Iterable, Sequence, Protocol, Any
 
 from django.db.models.base import Model
 from django.db.models.query import QuerySet
@@ -32,9 +32,7 @@ class Paginator:
     def validate_number(self, number: Optional[Union[float, str]]) -> int: ...
     def get_page(self, number: Optional[int]) -> Page: ...
     def page(self, number: Union[int, str]) -> Page: ...
-    @property
     def count(self) -> int: ...
-    @property
     def num_pages(self) -> int: ...
     @property
     def page_range(self) -> range: ...

django-stubs/core/servers/basehttp.pyi

@@ -4,7 +4,7 @@ from typing import Any, Dict
 from wsgiref import simple_server
 
 from django.core.handlers.wsgi import WSGIRequest, WSGIHandler
-from django.core.wsgi import get_wsgi_application as get_wsgi_application  # noqa: F401
+from django.core.wsgi import get_wsgi_application as get_wsgi_application
 
 class WSGIServer(simple_server.WSGIServer):
     request_queue_size: int = ...

django-stubs/core/signing.pyi

@@ -1,5 +1,7 @@
-from datetime import timedelta
-from typing import Any, Dict, Optional, Protocol, Type, Union
+from datetime import datetime, timedelta
+from typing import Any, Dict, List, Optional, Type, Union, Protocol
+
+from django.contrib.sessions.serializers import PickleSerializer
 
 class BadSignature(Exception): ...
 class SignatureExpired(BadSignature): ...

django-stubs/core/validators.pyi

@@ -5,7 +5,7 @@ from typing import Any, Dict, List, Optional, Union, Pattern, Collection
 from uuid import UUID
 
 from django.core.files.base import File
-from django.core.exceptions import ValidationError as ValidationError  # noqa: F401
+from django.core.exceptions import ValidationError as ValidationError
 
 EMPTY_VALUES: Any
 

django-stubs/db/backends/base/base.pyi

@@ -20,7 +20,7 @@ class BaseDatabaseWrapper:
     ops: Any = ...
     vendor: str = ...
     display_name: str = ...
-    SchemaEditorClass: Optional[BaseDatabaseSchemaEditor] = ...
+    SchemaEditorClass: Any = ...
     client_class: Any = ...
     creation_class: Any = ...
     features_class: Any = ...

django-stubs/db/backends/base/client.pyi

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional
 
 from django.db.backends.base.base import BaseDatabaseWrapper
 

django-stubs/db/backends/base/features.pyi

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional
 
 from django.db.backends.base.base import BaseDatabaseWrapper
 

django-stubs/db/backends/base/introspection.pyi

@@ -1,5 +1,5 @@
 from collections import namedtuple
-from typing import Any, Dict, List, Optional, Set, Type
+from typing import Any, Dict, List, Optional, Set, Tuple, Type, Union
 
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.backends.utils import CursorWrapper
@@ -13,7 +13,7 @@ class BaseDatabaseIntrospection:
     data_types_reverse: Any = ...
     connection: Any = ...
     def __init__(self, connection: BaseDatabaseWrapper) -> None: ...
-    def get_field_type(self, data_type: str, description: FieldInfo) -> str: ...
+    def get_field_type(self, data_type: str, description: FieldInfo) -> Union[Tuple[str, Dict[str, int]], str]: ...
     def table_name_converter(self, name: str) -> str: ...
     def column_name_converter(self, name: str) -> str: ...
     def table_names(self, cursor: Optional[CursorWrapper] = ..., include_views: bool = ...) -> List[str]: ...

django-stubs/db/backends/base/operations.pyi

@@ -1,18 +1,16 @@
-from datetime import date, datetime, timedelta, time
+from datetime import date, datetime, timedelta
 from decimal import Decimal
-from typing import Any, List, Optional, Sequence, Tuple, Type, Union
+from typing import Any, List, Optional, Set, Tuple, Type, Union, Sequence
 
 from django.core.management.color import Style
+from django.db import DefaultConnectionProxy
 from django.db.backends.base.base import BaseDatabaseWrapper
+from django.db.backends.sqlite3.base import DatabaseWrapper
 from django.db.backends.utils import CursorWrapper
 from django.db.models.base import Model
 from django.db.models.expressions import Case, Expression
-from django.db.models.sql.compiler import SQLCompiler
-
-from django.db import DefaultConnectionProxy
 from django.db.models.fields import Field
-
-_Connection = Union[DefaultConnectionProxy, BaseDatabaseWrapper]
+from django.db.models.sql.compiler import SQLCompiler
 
 class BaseDatabaseOperations:
     compiler_module: str = ...
@@ -26,8 +24,8 @@ class BaseDatabaseOperations:
     UNBOUNDED_FOLLOWING: Any = ...
     CURRENT_ROW: str = ...
     explain_prefix: Any = ...
-    connection: _Connection = ...
-    def __init__(self, connection: Optional[_Connection]) -> None: ...
+    connection: Any = ...
+    def __init__(self, connection: Optional[Union[DefaultConnectionProxy, BaseDatabaseWrapper]]) -> None: ...
     def autoinc_sql(self, table: str, column: str) -> None: ...
     def bulk_batch_size(self, fields: Any, objs: Any): ...
     def cache_key_culling_sql(self) -> str: ...
@@ -76,10 +74,10 @@ class BaseDatabaseOperations:
     def prep_for_like_query(self, x: str) -> str: ...
     prep_for_iexact_query: Any = ...
     def validate_autopk_value(self, value: int) -> int: ...
-    def adapt_unknown_value(self, value: Any) -> Any: ...
+    def adapt_unknown_value(self, value: Union[datetime, Decimal, int, str]) -> Union[int, str]: ...
     def adapt_datefield_value(self, value: Optional[date]) -> Optional[str]: ...
-    def adapt_datetimefield_value(self, value: Optional[datetime]) -> Optional[str]: ...
-    def adapt_timefield_value(self, value: Optional[Union[datetime, time]]) -> Optional[str]: ...
+    def adapt_datetimefield_value(self, value: None) -> None: ...
+    def adapt_timefield_value(self, value: Optional[datetime]) -> Optional[str]: ...
     def adapt_decimalfield_value(
         self, value: Optional[Decimal], max_digits: Optional[int] = ..., decimal_places: Optional[int] = ...
     ) -> Optional[str]: ...
@@ -88,17 +86,19 @@ class BaseDatabaseOperations:
     def year_lookup_bounds_for_datetime_field(self, value: int) -> List[str]: ...
     def get_db_converters(self, expression: Expression) -> List[Any]: ...
     def convert_durationfield_value(
-        self, value: Optional[float], expression: Expression, connection: _Connection
+        self, value: Optional[float], expression: Expression, connection: DatabaseWrapper
     ) -> Optional[timedelta]: ...
     def check_expression_support(self, expression: Any) -> None: ...
     def combine_expression(self, connector: str, sub_expressions: List[str]) -> str: ...
     def combine_duration_expression(self, connector: Any, sub_expressions: Any): ...
     def binary_placeholder_sql(self, value: Optional[Case]) -> str: ...
-    def modify_insert_params(self, placeholder: str, params: Any) -> Any: ...
+    def modify_insert_params(
+        self, placeholder: str, params: Union[List[None], List[bool], List[float], List[str]]
+    ) -> Union[List[None], List[bool], List[float], List[str]]: ...
     def integer_field_range(self, internal_type: Any): ...
     def subtract_temporals(self, internal_type: Any, lhs: Any, rhs: Any): ...
     def window_frame_start(self, start: Any): ...
     def window_frame_end(self, end: Any): ...
-    def window_frame_rows_start_end(self, start: Optional[int] = ..., end: Optional[int] = ...) -> Any: ...
-    def window_frame_range_start_end(self, start: Optional[int] = ..., end: Optional[int] = ...) -> Any: ...
+    def window_frame_rows_start_end(self, start: None = ..., end: None = ...) -> Any: ...
+    def window_frame_range_start_end(self, start: Optional[Any] = ..., end: Optional[Any] = ...): ...
     def explain_query_prefix(self, format: Optional[str] = ..., **options: Any) -> str: ...

django-stubs/db/backends/base/schema.pyi

@@ -48,7 +48,7 @@ class BaseDatabaseSchemaEditor(ContextManager[Any]):
     def quote_name(self, name: str) -> str: ...
     def column_sql(
         self, model: Type[Model], field: Field, include_default: bool = ...
-    ) -> Tuple[Optional[str], Optional[List[Any]]]: ...
+    ) -> Union[Tuple[None, None], Tuple[str, List[Any]]]: ...
     def skip_default(self, field: Any): ...
     def prepare_default(self, value: Any) -> None: ...
     def effective_default(self, field: Field) -> Optional[Union[int, str]]: ...

django-stubs/db/backends/base/validation.pyi

@@ -1,7 +1,6 @@
-from typing import Any, List
+from typing import Any, List, Optional
 
 from django.db.backends.base.base import BaseDatabaseWrapper
-
 from django.db.models.fields import Field
 
 class BaseDatabaseValidation:

django-stubs/db/backends/mysql/client.pyi

@@ -1,4 +1,4 @@
-from typing import Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
 from django.db.backends.base.client import BaseDatabaseClient
 

django-stubs/db/backends/postgresql/client.pyi

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Any, Dict, Optional
 
 from django.db.backends.base.client import BaseDatabaseClient
 

django-stubs/db/backends/sqlite3/base.pyi

@@ -1,5 +1,6 @@
 from sqlite3 import dbapi2 as Database
-from typing import Any, Callable
+from sqlite3 import dbapi2 as Database
+from typing import Any, Callable, Iterator
 
 from django.db.backends.base.base import BaseDatabaseWrapper
 

django-stubs/db/backends/sqlite3/introspection.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any, Dict, Optional, Tuple, Union
 
 from django.db.backends.base.introspection import BaseDatabaseIntrospection
 
@@ -8,6 +8,6 @@ def get_field_size(name: str) -> Optional[int]: ...
 
 class FlexibleFieldLookupDict:
     base_data_types_reverse: Any = ...
-    def __getitem__(self, key: str) -> Any: ...
+    def __getitem__(self, key: str) -> Union[Tuple[str, Dict[str, int]], str]: ...
 
 class DatabaseIntrospection(BaseDatabaseIntrospection): ...

django-stubs/db/backends/utils.pyi

@@ -1,7 +1,7 @@
 import types
 from datetime import date, datetime, time
 from decimal import Decimal
-from typing import Any, Dict, List, Mapping, Optional, Sequence, Tuple, Type, Union
+from typing import Any, Dict, Iterator, List, Mapping, Optional, Sequence, Tuple, Union, Type
 from uuid import UUID
 
 logger: Any

django-stubs/db/migrations/exceptions.pyi

@@ -1,4 +1,4 @@
-from typing import Optional, Tuple
+from typing import Any, Optional, Tuple
 
 from django.db.migrations.migration import Migration
 from django.db.utils import DatabaseError

django-stubs/db/migrations/graph.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Set, Tuple, Union
+from typing import Any, Callable, List, Optional, Tuple, Union, Set, Dict
 
 from django.db.migrations.migration import Migration, SwappableTuple
 from django.db.migrations.state import ProjectState

django-stubs/db/migrations/migration.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List, Tuple
+from typing import Any, Tuple, Type, List
 
 from django.db.backends.base.schema import BaseDatabaseSchemaEditor
 from django.db.migrations.state import ProjectState

django-stubs/db/migrations/utils.pyi

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Iterable, Union, Optional, List
 
 COMPILED_REGEX_TYPE: Any
 

django-stubs/db/models/__init__.pyi

@@ -40,7 +40,6 @@ from .fields import (
     DurationField as DurationField,
     BigAutoField as BigAutoField,
     CommaSeparatedIntegerField as CommaSeparatedIntegerField,
-    NOT_PROVIDED as NOT_PROVIDED,
 )
 
 from .fields.related import (
@@ -129,5 +128,3 @@ from .constraints import (
     CheckConstraint as CheckConstraint,
     UniqueConstraint as UniqueConstraint,
 )
-
-from .enums import Choices as Choices, IntegerChoices as IntegerChoices, TextChoices as TextChoices

django-stubs/db/models/aggregates.pyi

@@ -5,7 +5,6 @@ from django.db.models.expressions import Func
 class Aggregate(Func):
     filter_template: str = ...
     filter: Any = ...
-    allow_distinct: bool = ...
     def __init__(self, *expressions: Any, distinct: bool = ..., filter: Optional[Any] = ..., **extra: Any) -> None: ...
 
 class Avg(Aggregate): ...

django-stubs/db/models/base.pyi

@@ -1,8 +1,9 @@
-from typing import Any, Callable, Dict, List, Optional, Sequence, Set, Tuple, Type, TypeVar, Union, Collection
+from typing import Any, Dict, List, Optional, Sequence, Set, Tuple, TypeVar, Union, ClassVar, Type
+
+from django.db.models.manager import Manager
 
 from django.core.checks.messages import CheckMessage
-from django.core.exceptions import ValidationError
-from django.db.models.manager import Manager
+
 from django.db.models.options import Options
 
 _Self = TypeVar("_Self", bound="Model")
@@ -19,13 +20,10 @@ class Model(metaclass=ModelBase):
     pk: Any = ...
     def __init__(self: _Self, *args, **kwargs) -> None: ...
     def delete(self, using: Any = ..., keep_parents: bool = ...) -> Tuple[int, Dict[str, int]]: ...
-    def full_clean(self, exclude: Optional[Collection[str]] = ..., validate_unique: bool = ...) -> None: ...
+    def full_clean(self, exclude: Optional[List[str]] = ..., validate_unique: bool = ...) -> None: ...
     def clean(self) -> None: ...
-    def clean_fields(self, exclude: Optional[Collection[str]] = ...) -> None: ...
-    def validate_unique(self, exclude: Optional[Collection[str]] = ...) -> None: ...
-    def unique_error_message(
-        self, model_class: Type[_Self], unique_check: Collection[Union[Callable, str]]
-    ) -> ValidationError: ...
+    def clean_fields(self, exclude: List[str] = ...) -> None: ...
+    def validate_unique(self, exclude: List[str] = ...) -> None: ...
     def save(
         self,
         force_insert: bool = ...,