Model.objects should be a ClassVar

Model.objects is only available on classes and while we cannot force this, without ClassVar it's kind of only available on instances.

I have noticed this when I was writing a Jedi plugin that makes django-stubs work properly.

.editorconfig

@@ -0,0 +1,10 @@
+# Check http://editorconfig.org for more information
+# This is the main config file for this project:
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,35 @@
+---
+name: Bug
+about: Create a report of something is not working
+labels: 'bug'
+---
+
+# Bug report
+
+<!--
+Hi, thanks for submitting a bug. We appreciate that.
+
+But, we will need some information about what's wrong to help you.
+-->
+
+## What's wrong
+
+<!--
+Describe what is not working.
+
+Please, attach a traceback.
+We would also appreciate a failing test case.
+That is EXTREMELY helpful!
+-->
+
+## How is that should be
+
+<!-- Describe how it should work. -->
+
+## System information
+
+- OS:
+- `python` version:
+- `django` version:
+- `mypy` version:
+- `django-stubs` version:

.github/pull_request_template.md

@@ -0,0 +1,29 @@
+# I have made things!
+
+<!--
+Hi, thanks for submitting a Pull Request. We appreciate it.
+
+Please, fill in all the required information
+to make our review and merging processes easier.
+
+Cheers!
+-->
+
+## Related issues
+
+<!--
+Mark what issues this Pull Request closes or references.
+
+Format is:
+- Closes #issue-number
+- Refs #issue-number
+
+Example. Refs #0
+Documentation: https://blog.github.com/2013-05-14-closing-issues-via-pull-requests/
+-->
+
+<!--
+If you have any feedback, just write it here.
+
+It can be whatever you want!
+-->

.github/workflows/misspel.yml

@@ -0,0 +1,20 @@
+name: misspell
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: sobolevn/misspell-fixer-action@0.1.0
+    - uses: peter-evans/create-pull-request@v3
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        commit-message: 'Fixes by misspell-fixer'
+        title: 'Typos fix by misspell-fixer'

.github/workflows/test.yml

@@ -0,0 +1,85 @@
+name: test
+
+on: [push, pull_request, workflow_dispatch]
+
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.9']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ matrix.python-version }}-lint-${{ hashFiles('./dev-requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-${{ matrix.python-version }}-lint-
+      - name: Install dependencies
+        run: |
+          pip install -U pip setuptools wheel
+          pip install -r ./dev-requirements.txt
+
+      - name: Run pre-commit
+        run: pre-commit install && pre-commit run --all-files
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.7']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup system dependencies
+        run: sudo apt-get install binutils libproj-dev gdal-bin
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ matrix.python-version }}-test-${{ hashFiles('./dev-requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-${{ matrix.python-version }}-test-
+      - name: Install dependencies
+        run: |
+          pip install -U pip setuptools wheel
+          pip install -r ./dev-requirements.txt
+
+      - name: Run tests
+        run: pytest
+
+  typecheck:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.6', '3.7', '3.8', '3.9']
+        django-version: ['2.2', '3.0']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup system dependencies
+        run: sudo apt-get install binutils libproj-dev gdal-bin
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ matrix.django-version }}-typecheck-${{ hashFiles('./dev-requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ matrix.django-version }}-typecheck-
+      - name: Install dependencies
+        run: |
+          pip install -U pip setuptools wheel
+          pip install -r ./dev-requirements.txt
+
+      - name: Run tests
+        run: python ./scripts/typecheck_tests.py --django_version="${{ matrix.django-version }}"

.gitignore

@@ -1,11 +1,12 @@
 *.egg-info
-__pycache__/
-out/
-/test_sqlite.py
-/django
+.DS_Store
 .idea/
 .mypy_cache/
-build/
-dist/
+.pytest_cache/
+.venv/
+__pycache__/
+django-source/
+out/
 pip-wheel-metadata/
-.pytest_cache/
+stubgen/
+build/

.gitmodules

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

.pre-commit-config.yaml

@@ -0,0 +1,46 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+default_language_version:
+  python: python3.9
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.3.0
+    hooks:
+      - id: check-yaml
+      - id: trailing-whitespace
+      - id: check-executables-have-shebangs
+      - id: debug-statements
+      - id: check-merge-conflict
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.7.3
+    hooks:
+      - id: pyupgrade
+        args: ["--py36-plus"]
+  - repo: https://github.com/pre-commit/mirrors-isort
+    rev: v5.6.4
+    hooks:
+      - id: isort
+  - repo: https://github.com/psf/black
+    rev: 20.8b1
+    hooks:
+      - id: black
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.8.4
+    hooks:
+      - id: flake8
+  - repo: local
+    hooks:
+      - id: mypy
+        name: mypy
+        entry: mypy
+        language: system
+        types: [ python ]
+        exclude: "scripts/|django_stubs_ext/"
+        args: [ "--config=mypy.ini", "--cache-dir=/dev/null", "--no-incremental" ]
+      - id: mypy
+        name: mypy (django_stubs_ext)
+        entry: mypy
+        language: system
+        types: [ python ]
+        files: "django_stubs_ext/|django_stubs_ext/tests/"
+        args: [ "--config=mypy.ini", "--cache-dir=/dev/null", "--no-incremental", "--strict" ]

.travis.yml

@@ -1,41 +0,0 @@
-language: python
-cache: pip
-dist: xenial
-sudo: required
-jobs:
-  include:
-    - name: Run plugin test suite with python 3.7
-      python: 3.7
-      script: |
-        set -e
-        pytest
-
-    - 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: 'python ./scripts/typecheck_tests.py'
-
-    - name: Mypy for plugin code
-      python: 3.7
-      script: 'mypy ./mypy_django_plugin'
-
-    - name: Lint with black
-      python: 3.7
-      script: 'black --check --line-length=120 django-stubs/'
-
-    - name: Lint plugin code with flake8
-      python: 3.7
-      script: 'flake8'
-
-    - name: Lint plugin code with isort
-      python: 3.7
-      script: 'isort --check'
-
-before_install: |
-  # Upgrade pip, setuptools, and wheel
-  pip install -U pip setuptools wheel
-install: |
-  pip install -r ./dev-requirements.txt

CONTRIBUTING.md

@@ -0,0 +1,112 @@
+# Contribution Guide
+
+This project is open source and community driven. As such we encourage code contributions of all kinds. Some areas you can contribute in:
+
+1. Improve the stubs
+2. Sync stubs with the latest version of Django
+3. Improve plugin code and extend its capabilities
+4. Write tests
+5. Update dependencies
+
+## Tutorials
+
+If you want to start working on this project, you will need to get familiar with python typings.
+The Mypy documentation offers an excellent resource for this, as well as the python official documentation:
+
+- [Mypy typing documentation](https://mypy.readthedocs.io/en/stable/#overview-type-system-reference)
+- [Python official typing documentation](https://docs.python.org/3/library/typing.html)
+- [Typing in Python](https://inventwithpython.com/blog/2019/11/24/type-hints-for-busy-python-programmers/) article
+
+Additionally, the following resources might be useful:
+
+- [How to write custom mypy plugins](https://mypy.readthedocs.io/en/stable/extending_mypy.html)
+- [Typechecking Django and DRF](https://sobolevn.me/2019/08/typechecking-django-and-drf) guide
+- [Testing mypy stubs, plugins, and types](https://sobolevn.me/2019/08/testing-mypy-types) guide
+- [Awesome Python Typing](https://github.com/typeddjango/awesome-python-typing) list
+
+## Dev setup
+
+### Repository Setup
+
+As a first step you will need to fork this repository and clone your fork locally.
+In order to be able to continously sync your fork with the origin repository's master branch, you will need to set up an upstream master. To do so follow this [official github guide](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/syncing-a-fork).
+
+### Dependency Setup
+
+After your repository is setup you will then need to create and activate a git ignored virtual env, e.g.:
+
+```bash
+python3 -m venv .venv
+source .venv/bin/activate
+```
+
+Then install the dev requirements:
+
+```bash
+pip install -r ./dev-requirements.txt
+```
+
+Finally, install the pre-commit hooks:
+
+```bash
+pre-commit install
+```
+
+### Testing and Linting
+
+We use `mypy`, `pytest`, `flake8`, and `black` for quality control. All tools except pytest are executed using pre-commit when you make a commit.
+To ensure there are not formatting or typing issues in the entire repository you can run:
+
+```bash
+pre-commit run --all-files
+```
+
+NOTE: This command will not only lint but also modify files - so make sure to commit whatever changes you've made before hand.
+You can also run pre-commit per file or for a specific path, simply replace "--all-files" with a target (see [this guide](https://codeburst.io/tool-your-django-project-pre-commit-hooks-e1799d84551f) for more info).
+
+To execute the unit tests, simply run:
+
+```bash
+pytest
+```
+
+We also test the stubs against the Django's own test suite. This is done in CI but you can also do this locally.
+To execute the script run:
+
+```bash
+python ./scripts/typecheck_tests.py --django_version 3.0
+```
+
+
+### Generating Stubs using Stubgen
+
+The stubs are based on auto-generated code created by Mypy's stubgen tool (see: [the stubgen docs](https://mypy.readthedocs.io/en/stable/stubgen.html)).
+To make life easier we have a helper script that auto generates these stubs. To use it you can run:
+
+```bash
+python ./scripts/stubgen-django.py --django_version 3.1
+```
+
+You can also pass an optional commit hash as a second kwarg to checkout a specific commit, e.g.
+
+```bash
+python ./scripts/stubgen-django.py --django_version 3.1 --commit_sha <commit_sha>
+```
+
+The output for this is a gitignored folder called "stubgen" in the repo's root.
+
+## Submission Guidelines
+
+The workflow for contributions is fairly simple:
+
+1. fork and setup the repository as in the previous step.
+2. create a local branch.
+3. make whatever changes you want to contribute.
+4. ensure your contribution does not introduce linting issues or breaks the tests by linting and testing the code.
+5. make a pull request with an adequate description.
+
+## A Note About Generics
+
+As Django uses a lot of the more dynamic features of Python (i.e. metaobjects), statically typing it requires heavy use of generics. Unfortunately, the syntax for generics is also valid python syntax. For instance, the statement `class SomeClass(SuperType[int])` implicitly translates to `class SomeClass(SuperType.__class_getitem__(int))`. If `SuperType` doesn't define the `__class_getitem__` method, this causes a runtime error, even if the code typechecks.
+
+When adding a new generic class, or changing an existing class to use generics, run a quick test to see if it causes a runtime error. If it does, please add the new generic class to the `_need_generic` list in the [django_stubs_ext monkeypatch function](https://github.com/typeddjango/django-stubs/tree/master/django_stubs_ext/django_stubs_ext/monkeypatch.py)

README.md

@@ -1,71 +1,190 @@
 <img src="http://mypy-lang.org/static/mypy_light.svg" alt="mypy logo" width="300px"/>
 
-# pep484 stubs for Django framework
+# pep484 stubs for Django
 
-[![Build Status](https://travis-ci.org/mkurnikov/django-stubs.svg?branch=master)](https://travis-ci.org/mkurnikov/django-stubs)
+[![Build status](https://github.com/typeddjango/django-stubs/workflows/test/badge.svg?branch=master&event=push)](https://github.com/typeddjango/django-stubs/actions?query=workflow%3Atest)
 [![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.
 
-Supports Python 3.6/3.7, and Django 2.1/2.2.
+This package contains [type stubs](https://www.python.org/dev/peps/pep-0561/) and a custom 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 this project. 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.
 
 ## Installation
 
-```
+```bash
 pip install django-stubs
 ```
 
-### WARNING: All configuration from pre-1.0.0 versions is dropped, use one below.
-
-### 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` file.
-
-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
 [mypy.plugins.django-stubs]
-django_settings_module = mysettings
-```
-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}
+django_settings_module = "myproject.settings"
 ```
 
-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 your `mypy.ini` or `setup.cfg` [file](https://mypy.readthedocs.io/en/latest/config_file.html).
 
-In other words, if your `manage.py runserver` crashes, mypy will crash too. 
+Two things happeining here:
 
-## Notes
+1. We need to explicitly list our plugin to be loaded by `mypy`
+2. Our plugin also requires `django` settings module (what you put into `DJANGO_SETTINGS_MODULE` variable) to be specified
 
-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
+This fully working [typed boilerplate](https://github.com/wemake-services/wemake-django-template) can serve you as an example.
+
+## Version compatibility
+
+We rely on different `django` and `mypy` versions:
+
+| django-stubs | mypy version | django version | python version
+| ------------ | ---- | ---- | ---- |
+| 1.7.0 | 0.790 | 2.2.x \|\| 3.x | ^3.6
+| 1.6.0 | 0.780 | 2.2.x \|\| 3.x | ^3.6
+| 1.5.0 | 0.770 | 2.2.x \|\| 3.x | ^3.6
+| 1.4.0 | 0.760 | 2.2.x \|\| 3.x | ^3.6
+| 1.3.0 | 0.750 | 2.2.x \|\| 3.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
+
+
+## FAQ
+
+### Is this an official Django project?
+
+No, it is not. We are independent from Django at the moment.
+There's a [proposal](https://github.com/django/deps/pull/65) to merge our project into the Django itself.
+You can show your support by liking the PR.
+
+### Is it safe to use this in production?
+
+Yes, it is! This project does not affect your runtime at all.
+It only affects `mypy` type checking process.
+
+But, it does not make any sense to use this project without `mypy`.
+
+### mypy crashes when I run it with this plugin installed
+
+Current implementation uses Django runtime to extract models information, so it will crash, if your installed apps or `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.
+You can also run `mypy` with [`--tb`](https://mypy.readthedocs.io/en/stable/command_line.html#cmdoption-mypy-show-traceback)
+option to get extra information about the error.
+
+### I cannot use QuerySet or Manager with type annotations
+
+You can get a `TypeError: 'type' object is not subscriptable`
+when you will try to use `QuerySet[MyModel]`, `Manager[MyModel]` or some other Django-based Generic types.
+
+This happens because these Django classes do not support [`__class_getitem__`](https://www.python.org/dev/peps/pep-0560/#class-getitem) magic method in runtime.
+
+1. You can go with our [`django_stubs_ext`](https://github.com/typeddjango/django-stubs/tree/master/django_stubs_ext) helper, that patches all the types we use as Generic in django.
+
+Install it:
+
+```bash
+pip install django-stubs-ext  # as a production dependency
 ```
-class MyUserManager(models.Manager['MyUser']):
-    pass
-class MyUser(models.Model):
-    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`. 
+And then place in your top-level settings:
+
+```python
+import django_stubs_ext
+
+django_stubs_ext.monkeypatch()
+```
+
+2. You can use strings instead: `'QuerySet[MyModel]'` and `'Manager[MyModel]'`, this way it will work as a type for `mypy` and as a regular `str` in runtime.
+
+### How can I create a HttpRequest that's guaranteed to have an authenticated user?
+
+Django's built in `HttpRequest` has the attribute `user` that resolves to the type
+```python
+Union[User, AnonymousUser]
+```
+where `User` is the user model specified by the `AUTH_USER_MODEL` setting.
+
+If you want a `HttpRequest` that you can type-annotate with where you know that the user is authenticated you can subclass the normal `HttpRequest` class like so:
+```python
+from django.http import HttpRequest
+from my_user_app.models import MyUser
+
+class AuthenticatedHttpRequest(HttpRequest):
+    user: MyUser
+```
+
+And then use `AuthenticatedHttpRequest` instead of the standard `HttpRequest` for when you know that the user is authenticated. For example in views using the `@login_required` decorator.
+
+
+### My QuerySet methods are returning Any rather than my Model
+
+`QuerySet.as_manager()` is not currently supported.
+
+If you are using `MyQuerySet.as_manager()`, then your `Manager`/`QuerySet` methods will all not be linked to your model.
+
+Example:
+
+```python
+from django.db import models
+
+class MyModelQuerySet(models.QuerySet):
+  pass
+
+class MyModel(models.Model):
+  bar = models.IntegerField()
+  objects = MyModelQuerySet.as_manager()
+
+def use_my_model():
+  foo = MyModel.objects.get(id=1) # This is `Any` but it should be `MyModel`
+  return foo.xyz # No error, but there should be
+```
+
+There is a workaround: use `Manager.from_queryset` instead.
+
+Example:
+
+```python
+from django.db import models
+
+class MyModelQuerySet(models.QuerySet):
+  pass
+
+MyModelManager = models.Manager.from_queryset(MyModelQuerySet)
+
+class MyModel(models.Model):
+  bar = models.IntegerField()
+  objects = MyModelManager()
+
+def use_my_model():
+  foo = MyModel.objects.get(id=1)
+  return foo.xyz # Gives an error
+```
+
+
+## Related projects
+
+- [`awesome-python-typing`](https://github.com/typeddjango/awesome-python-typing) - Awesome list of all typing-related things in Python.
+- [`djangorestframework-stubs`](https://github.com/typeddjango/djangorestframework-stubs) - Stubs for Django REST Framework.
+- [`pytest-mypy-plugins`](https://github.com/typeddjango/pytest-mypy-plugins) - `pytest` plugin that we use for testing `mypy` stubs and plugins.
+- [`wemake-django-template`](https://github.com/wemake-services/wemake-django-template) - Create new typed Django projects in seconds.
+
+
 
 ## 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.
 
-If you think you have more generic typing issue, please refer to https://github.com/python/mypy and their Gitter.
+## Contributing
+
+This project is open source and community driven. As such we encourage contributions big and small. You can contribute by doing any of the following:
+
+1. Contribute code (e.g. improve stubs, add plugin capabilities, write tests etc) - to do so please follow the [contribution guide](./CONTRIBUTING.md).
+2. Assist in code reviews and discussions in issues.
+3. Identify bugs and issues and report these
+
+You can always also reach out in gitter to discuss your contributions!

dev-requirements.txt

@@ -1,6 +1,12 @@
-black
-pytest-mypy-plugins==1.0.3
-psycopg2
-flake8
-isort==4.3.4
+wheel
+mypy==0.790
+requests==2.24.0
+coreapi==2.3.3
+typing-extensions==3.7.4.3
+gitpython==3.1.9
+pre-commit==2.7.1
+pytest==6.1.1
+pytest-mypy-plugins==1.6.1
+psycopg2-binary
+-e ./django_stubs_ext
 -e .

django-stubs/apps/config.pyi

@@ -1,5 +1,6 @@
 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
@@ -7,11 +8,11 @@ MODELS_MODULE_NAME: str
 class AppConfig:
     name: str = ...
     module: Optional[Any] = ...
-    apps: None = ...
+    apps: Optional[Apps] = ...
     label: str = ...
     verbose_name: str = ...
     path: str = ...
-    models_module: None = ...
+    models_module: Optional[str] = ...
     models: Dict[str, Type[Model]] = ...
     def __init__(self, app_name: str, app_module: Optional[Any]) -> None: ...
     @classmethod

django-stubs/apps/registry.pyi

@@ -1,39 +1,37 @@
 import threading
-from collections import OrderedDict
-from typing import Any, Callable, List, Optional, Tuple, Type, Union, Iterable, DefaultDict, Dict
+from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type, Union
 
-from django.db.migrations.state import AppConfigStub
 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, Dict[str, Type[Model]]] = ...
+    app_configs: Dict[str, AppConfig] = ...
     stored_app_configs: List[Any] = ...
     apps_ready: bool = ...
     ready_event: threading.Event = ...
     loading: bool = ...
-    _pending_operations: DefaultDict[Tuple[str, str], List]
+    _pending_operations: Dict[Tuple[str, str], List]
     models_ready: bool = ...
     ready: bool = ...
-    def __init__(self, installed_apps: Optional[Union[List[AppConfigStub], List[str], Tuple]] = ...) -> None: ...
-    def populate(self, installed_apps: Union[List[AppConfigStub], List[str], Tuple] = ...) -> None: ...
+    def __init__(self, installed_apps: Optional[Iterable[Union[AppConfig, str]]] = ...) -> None: ...
+    def populate(self, installed_apps: Iterable[Union[AppConfig, str]] = ...) -> None: ...
     def check_apps_ready(self) -> None: ...
     def check_models_ready(self) -> None: ...
     def get_app_configs(self) -> Iterable[AppConfig]: ...
     def get_app_config(self, app_label: str) -> AppConfig: ...
     # it's not possible to support it in plugin properly now
-    def get_models(self, include_auto_created: bool = ..., include_swapped: bool = ...) -> List[Type[Any]]: ...
+    def get_models(self, include_auto_created: bool = ..., include_swapped: bool = ...) -> List[Type[Model]]: ...
     def get_model(self, app_label: str, model_name: Optional[str] = ..., require_ready: bool = ...) -> Type[Any]: ...
     def register_model(self, app_label: str, model: Type[Model]) -> None: ...
     def is_installed(self, app_name: str) -> bool: ...
     def get_containing_app_config(self, object_name: str) -> Optional[AppConfig]: ...
     def get_registered_model(self, app_label: str, model_name: str) -> Type[Model]: ...
     def get_swappable_settings_name(self, to_string: str) -> Optional[str]: ...
-    def set_available_apps(self, available: List[str]) -> None: ...
+    def set_available_apps(self, available: Iterable[str]) -> None: ...
     def unset_available_apps(self) -> None: ...
-    def set_installed_apps(self, installed: Union[List[str], Tuple[str]]) -> None: ...
+    def set_installed_apps(self, installed: Iterable[str]) -> None: ...
     def unset_installed_apps(self) -> None: ...
     def clear_cache(self) -> None: ...
     def lazy_model_operation(self, function: Callable, *model_keys: Any) -> None: ...

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 = "Lax"
+SESSION_COOKIE_SAMESITE: Optional[str] = ...
 # 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 = "Lax"
+CSRF_COOKIE_SAMESITE: Optional[str] = ...
 CSRF_HEADER_NAME = "HTTP_X_CSRFTOKEN"
 CSRF_TRUSTED_ORIGINS: List[str] = ...
 CSRF_USE_SESSIONS = False

django-stubs/conf/urls/__init__.pyi

@@ -5,10 +5,10 @@ from django.http.response import HttpResponse, HttpResponseBase
 
 from django.urls import URLResolver, URLPattern
 
-handler400: Callable[..., HttpResponse] = ...
-handler403: Callable[..., HttpResponse] = ...
-handler404: Callable[..., HttpResponse] = ...
-handler500: Callable[..., HttpResponse] = ...
+handler400: Union[str, Callable[..., HttpResponse]] = ...
+handler403: Union[str, Callable[..., HttpResponse]] = ...
+handler404: Union[str, Callable[..., HttpResponse]] = ...
+handler500: Union[str, Callable[..., HttpResponse]] = ...
 
 IncludedURLConf = Tuple[List[URLResolver], Optional[str], Optional[str]]
 

django-stubs/contrib/admin/checks.pyi

@@ -1,15 +1,17 @@
-from typing import Any, List, Union
+from typing import Any, List, Union, Optional, Sequence
 
-from django.contrib.admin.options import BaseModelAdmin, InlineModelAdmin, ModelAdmin
-from django.core.checks.messages import Error
+from django.contrib.admin.options import BaseModelAdmin
+from django.core.checks.messages import CheckMessage, Error
+
+from django.apps.config import AppConfig
 
 _CheckError = Union[str, Error]
 
-def check_admin_app(app_configs: None, **kwargs: Any) -> List[_CheckError]: ...
+def check_admin_app(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> List[_CheckError]: ...
 def check_dependencies(**kwargs: Any) -> List[_CheckError]: ...
 
 class BaseModelAdminChecks:
-    def check(self, admin_obj: BaseModelAdmin, **kwargs: Any) -> List[_CheckError]: ...
+    def check(self, admin_obj: BaseModelAdmin, **kwargs: Any) -> List[CheckMessage]: ...
 
 class ModelAdminChecks(BaseModelAdminChecks): ...
 class InlineModelAdminChecks(BaseModelAdminChecks): ...

django-stubs/contrib/admin/decorators.pyi

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

django-stubs/contrib/admin/exceptions.pyi

@@ -0,0 +1,4 @@
+from django.core.exceptions import SuspiciousOperation as SuspiciousOperation
+
+class DisallowedModelAdminLookup(SuspiciousOperation): ...
+class DisallowedModelAdminToField(SuspiciousOperation): ...

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) -> None: ...
+    def lookups(self, request: Any, model_admin: Any) -> List[Tuple[Any, str]]: ...
 
 class FieldListFilter(ListFilter):
     field: Field = ...

django-stubs/contrib/admin/helpers.pyi

@@ -1,7 +1,7 @@
-from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union
+from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union, Iterable
 
-from django.contrib.auth.forms import AdminPasswordChangeForm
 from django.forms.boundfield import BoundField
+from django.forms.forms import BaseForm
 from django.forms.utils import ErrorDict
 from django.forms.widgets import Media, Widget
 from django.utils.safestring import SafeText
@@ -23,10 +23,10 @@ class AdminForm:
     readonly_fields: Any = ...
     def __init__(
         self,
-        form: AdminPasswordChangeForm,
+        form: BaseForm,
         fieldsets: List[Tuple[None, Dict[str, List[str]]]],
         prepopulated_fields: Dict[Any, Any],
-        readonly_fields: Any = ...,
+        readonly_fields: Optional[Iterable[Any]] = ...,
         model_admin: Any = ...,
     ) -> None: ...
     def __iter__(self) -> Iterator[Fieldset]: ...
@@ -47,7 +47,7 @@ class Fieldset:
         self,
         form: Any,
         name: Optional[Any] = ...,
-        readonly_fields: Any = ...,
+        readonly_fields: Optional[Iterable[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[Any] = ..., model_admin: Optional[Any] = ...
+        self, form: Any, field: Any, readonly_fields: Optional[Iterable[Any]] = ..., model_admin: Optional[Any] = ...
     ) -> None: ...
     def __iter__(self) -> Iterator[Union[AdminField, AdminReadonlyField]]: ...
     def errors(self) -> SafeText: ...

django-stubs/contrib/admin/options.pyi

@@ -1,5 +1,24 @@
 from collections import OrderedDict
-from typing import Any, Callable, Dict, Iterator, List, Optional, Sequence, Set, Tuple, Type, Union
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    Generic,
+    Iterator,
+    List,
+    Optional,
+    Sequence,
+    Set,
+    Tuple,
+    Type,
+    Union,
+    Mapping,
+    TypeVar,
+)
+
+from django.forms.forms import BaseForm
+from django.forms.models import BaseInlineFormSet
+from typing_extensions import Literal, TypedDict
 
 from django.contrib.admin.filters import ListFilter
 from django.contrib.admin.models import LogEntry
@@ -7,7 +26,7 @@ from django.contrib.admin.sites import AdminSite
 from django.contrib.admin.views.main import ChangeList
 from django.contrib.auth.forms import AdminPasswordChangeForm
 from django.contrib.contenttypes.models import ContentType
-from django.core.checks.messages import Error
+from django.core.checks.messages import CheckMessage
 from django.core.paginator import Paginator
 from django.db.models.base import Model
 from django.db.models.fields.related import ForeignKey, ManyToManyField, RelatedField
@@ -26,8 +45,10 @@ from django.db.models.fields import Field
 
 IS_POPUP_VAR: str
 TO_FIELD_VAR: str
-HORIZONTAL: Any
-VERTICAL: Any
+HORIZONTAL: Literal[1] = ...
+VERTICAL: Literal[2] = ...
+
+_Direction = Union[Literal[1], Literal[2]]
 
 def get_content_type_for_model(obj: Union[Type[Model], Model]) -> ContentType: ...
 def get_ul_class(radio_style: int) -> str: ...
@@ -37,26 +58,43 @@ class IncorrectLookupParameters(Exception): ...
 FORMFIELD_FOR_DBFIELD_DEFAULTS: Any
 csrf_protect_m: Any
 
-class BaseModelAdmin:
-    autocomplete_fields: Any = ...
-    raw_id_fields: Any = ...
-    fields: Any = ...
-    exclude: Any = ...
-    fieldsets: Any = ...
-    form: Any = ...
-    filter_vertical: Any = ...
-    filter_horizontal: Any = ...
-    radio_fields: Any = ...
-    prepopulated_fields: Any = ...
-    formfield_overrides: Any = ...
-    readonly_fields: Any = ...
-    ordering: Any = ...
-    sortable_by: Any = ...
+class _OptionalFieldOpts(TypedDict, total=False):
+    classes: Sequence[str]
+    description: str
+
+class _FieldOpts(_OptionalFieldOpts, total=True):
+    fields: Sequence[Union[str, Sequence[str]]]
+
+# Workaround for mypy issue, a Sequence type should be preferred here.
+# https://github.com/python/mypy/issues/8921
+# _FieldsetSpec = Sequence[Tuple[Optional[str], _FieldOpts]]
+_T = TypeVar("_T")
+_ListOrTuple = Union[Tuple[_T, ...], List[_T]]
+_FieldsetSpec = _ListOrTuple[Tuple[Optional[str], _FieldOpts]]
+
+# Generic type specifically for models, for use in BaseModelAdmin and subclasses
+# https://github.com/typeddjango/django-stubs/issues/482
+_ModelT = TypeVar("_ModelT", bound=Model)
+
+class BaseModelAdmin(Generic[_ModelT]):
+    autocomplete_fields: Sequence[str] = ...
+    raw_id_fields: Sequence[str] = ...
+    fields: Sequence[Union[str, Sequence[str]]] = ...
+    exclude: Sequence[str] = ...
+    fieldsets: _FieldsetSpec = ...
+    form: Type[BaseForm] = ...
+    filter_vertical: Sequence[str] = ...
+    filter_horizontal: Sequence[str] = ...
+    radio_fields: Mapping[str, _Direction] = ...
+    prepopulated_fields: Mapping[str, Sequence[str]] = ...
+    formfield_overrides: Mapping[Type[Field], Mapping[str, Any]] = ...
+    readonly_fields: Sequence[Union[str, Callable[[_ModelT], Any]]] = ...
+    ordering: Sequence[str] = ...
+    sortable_by: Sequence[str] = ...
     view_on_site: bool = ...
     show_full_result_count: bool = ...
     checks_class: Any = ...
-    def check(self, **kwargs: Any) -> List[Union[str, Error]]: ...
-    def __init__(self) -> None: ...
+    def check(self, **kwargs: Any) -> List[CheckMessage]: ...
     def formfield_for_dbfield(
         self, db_field: Field, request: Optional[HttpRequest], **kwargs: Any
     ) -> Optional[Field]: ...
@@ -73,29 +111,28 @@ class BaseModelAdmin:
         self, db_field: ManyToManyField, request: Optional[HttpRequest], **kwargs: Any
     ) -> ModelMultipleChoiceField: ...
     def get_autocomplete_fields(self, request: HttpRequest) -> Tuple: ...
-    def get_view_on_site_url(self, obj: Optional[Model] = ...) -> Optional[str]: ...
+    def get_view_on_site_url(self, obj: Optional[_ModelT] = ...) -> Optional[str]: ...
     def get_empty_value_display(self) -> SafeText: ...
-    def get_exclude(self, request: HttpRequest, obj: Optional[Model] = ...) -> Any: ...
-    def get_fields(self, request: HttpRequest, obj: Optional[Model] = ...) -> Sequence[Union[Callable, str]]: ...
+    def get_exclude(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> Any: ...
+    def get_fields(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> Sequence[Union[Callable, str]]: ...
     def get_fieldsets(
-        self, request: HttpRequest, obj: Optional[Model] = ...
+        self, request: HttpRequest, obj: Optional[_ModelT] = ...
     ) -> List[Tuple[Optional[str], Dict[str, Any]]]: ...
     def get_ordering(self, request: HttpRequest) -> Union[List[str], Tuple]: ...
-    def get_readonly_fields(self, request: HttpRequest, obj: Optional[Model] = ...) -> Union[List[str], Tuple]: ...
-    def get_prepopulated_fields(self, request: HttpRequest, obj: Optional[Model] = ...) -> Dict[str, Tuple[str]]: ...
+    def get_readonly_fields(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> Union[List[str], Tuple]: ...
+    def get_prepopulated_fields(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> Dict[str, Tuple[str]]: ...
     def get_queryset(self, request: HttpRequest) -> QuerySet: ...
     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, 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_add_permission(self, request: HttpRequest) -> bool: ...
+    def has_change_permission(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> bool: ...
+    def has_delete_permission(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> bool: ...
+    def has_view_permission(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> bool: ...
     def has_module_permission(self, request: HttpRequest) -> bool: ...
 
-class ModelAdmin(BaseModelAdmin):
-    formfield_overrides: Any
-    list_display: Sequence[Union[str, Callable]] = ...
+class ModelAdmin(BaseModelAdmin[_ModelT]):
+    list_display: Sequence[Union[str, Callable[[_ModelT], Any]]] = ...
     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]] = ...
@@ -103,44 +140,44 @@ class ModelAdmin(BaseModelAdmin):
     list_max_show_all: int = ...
     list_editable: Sequence[str] = ...
     search_fields: Sequence[str] = ...
-    date_hierarchy: Optional[Any] = ...
+    date_hierarchy: Optional[str] = ...
     save_as: bool = ...
     save_as_continue: bool = ...
     save_on_top: bool = ...
-    paginator: Any = ...
+    paginator: Type = ...
     preserve_filters: bool = ...
     inlines: Sequence[Type[InlineModelAdmin]] = ...
-    add_form_template: Any = ...
-    change_form_template: Any = ...
-    change_list_template: Any = ...
-    delete_confirmation_template: Any = ...
-    delete_selected_confirmation_template: Any = ...
-    object_history_template: Any = ...
-    popup_response_template: Any = ...
-    actions: Any = ...
+    add_form_template: str = ...
+    change_form_template: str = ...
+    change_list_template: str = ...
+    delete_confirmation_template: str = ...
+    delete_selected_confirmation_template: str = ...
+    object_history_template: str = ...
+    popup_response_template: str = ...
+    actions: Optional[Sequence[Union[Callable[[ModelAdmin, HttpRequest, QuerySet], None], str]]] = ...
     action_form: Any = ...
     actions_on_top: bool = ...
     actions_on_bottom: bool = ...
     actions_selection_counter: bool = ...
-    checks_class: Any = ...
-    model: Type[Model] = ...
+    model: Type[_ModelT] = ...
     opts: Options = ...
     admin_site: AdminSite = ...
-    def __init__(self, model: Type[Model], admin_site: Optional[AdminSite]) -> None: ...
-    def get_inline_instances(self, request: HttpRequest, obj: Optional[Model] = ...) -> List[InlineModelAdmin]: ...
+    def __init__(self, model: Type[_ModelT], admin_site: Optional[AdminSite]) -> None: ...
+    def get_inlines(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> List[Type[InlineModelAdmin]]: ...
+    def get_inline_instances(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> List[InlineModelAdmin]: ...
     def get_urls(self) -> List[URLPattern]: ...
     @property
     def urls(self) -> List[URLPattern]: ...
     @property
     def media(self) -> Media: ...
     def get_model_perms(self, request: HttpRequest) -> Dict[str, bool]: ...
-    def get_form(self, request: Any, obj: Optional[Any] = ..., change: bool = ..., **kwargs: Any): ...
+    def get_form(self, request: Any, obj: Optional[_ModelT] = ..., change: bool = ..., **kwargs: Any): ...
     def get_changelist(self, request: HttpRequest, **kwargs: Any) -> Type[ChangeList]: ...
     def get_changelist_instance(self, request: HttpRequest) -> ChangeList: ...
-    def get_object(self, request: HttpRequest, object_id: str, from_field: None = ...) -> Optional[Model]: ...
+    def get_object(self, request: HttpRequest, object_id: str, from_field: None = ...) -> Optional[_ModelT]: ...
     def get_changelist_form(self, request: Any, **kwargs: Any): ...
     def get_changelist_formset(self, request: Any, **kwargs: Any): ...
-    def get_formsets_with_inlines(self, request: HttpRequest, obj: Optional[Model] = ...) -> Iterator[Any]: ...
+    def get_formsets_with_inlines(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> Iterator[Any]: ...
     def get_paginator(
         self,
         request: HttpRequest,
@@ -149,10 +186,10 @@ class ModelAdmin(BaseModelAdmin):
         orphans: int = ...,
         allow_empty_first_page: bool = ...,
     ) -> Paginator: ...
-    def log_addition(self, request: HttpRequest, object: Model, message: Any) -> LogEntry: ...
-    def log_change(self, request: HttpRequest, object: Model, message: Any) -> LogEntry: ...
-    def log_deletion(self, request: HttpRequest, object: Model, object_repr: str) -> LogEntry: ...
-    def action_checkbox(self, obj: Model) -> SafeText: ...
+    def log_addition(self, request: HttpRequest, object: _ModelT, message: Any) -> LogEntry: ...
+    def log_change(self, request: HttpRequest, object: _ModelT, message: Any) -> LogEntry: ...
+    def log_deletion(self, request: HttpRequest, object: _ModelT, object_repr: str) -> LogEntry: ...
+    def action_checkbox(self, obj: _ModelT) -> SafeText: ...
     def get_actions(self, request: HttpRequest) -> OrderedDict: ...
     def get_action_choices(
         self, request: HttpRequest, default_choices: List[Tuple[str, str]] = ...
@@ -181,8 +218,8 @@ class ModelAdmin(BaseModelAdmin):
         fail_silently: bool = ...,
     ) -> None: ...
     def save_form(self, request: Any, form: Any, change: Any): ...
-    def save_model(self, request: Any, obj: Any, form: Any, change: Any) -> None: ...
-    def delete_model(self, request: HttpRequest, obj: Model) -> None: ...
+    def save_model(self, request: Any, obj: _ModelT, form: Any, change: Any) -> None: ...
+    def delete_model(self, request: HttpRequest, obj: _ModelT) -> None: ...
     def delete_queryset(self, request: HttpRequest, queryset: QuerySet) -> None: ...
     def save_formset(self, request: Any, form: Any, formset: Any, change: Any) -> None: ...
     def save_related(self, request: Any, form: Any, formsets: Any, change: Any) -> None: ...
@@ -193,19 +230,19 @@ class ModelAdmin(BaseModelAdmin):
         add: bool = ...,
         change: bool = ...,
         form_url: str = ...,
-        obj: Optional[Any] = ...,
+        obj: Optional[_ModelT] = ...,
     ): ...
     def response_add(
-        self, request: HttpRequest, obj: Model, post_url_continue: Optional[str] = ...
+        self, request: HttpRequest, obj: _ModelT, post_url_continue: Optional[str] = ...
     ) -> HttpResponse: ...
-    def response_change(self, request: HttpRequest, obj: Model) -> HttpResponse: ...
-    def response_post_save_add(self, request: HttpRequest, obj: Model) -> HttpResponseRedirect: ...
-    def response_post_save_change(self, request: HttpRequest, obj: Model) -> HttpResponseRedirect: ...
+    def response_change(self, request: HttpRequest, obj: _ModelT) -> HttpResponse: ...
+    def response_post_save_add(self, request: HttpRequest, obj: _ModelT) -> HttpResponseRedirect: ...
+    def response_post_save_change(self, request: HttpRequest, obj: _ModelT) -> HttpResponseRedirect: ...
     def response_action(self, request: HttpRequest, queryset: QuerySet) -> Optional[HttpResponseBase]: ...
     def response_delete(self, request: HttpRequest, obj_display: str, obj_id: int) -> HttpResponse: ...
     def render_delete_form(self, request: Any, context: Any): ...
     def get_inline_formsets(
-        self, request: HttpRequest, formsets: List[Any], inline_instances: List[Any], obj: Optional[Model] = ...
+        self, request: HttpRequest, formsets: List[Any], inline_instances: List[Any], obj: Optional[_ModelT] = ...
     ) -> List[Any]: ...
     def get_changeform_initial_data(self, request: HttpRequest) -> Dict[str, str]: ...
     def changeform_view(
@@ -229,10 +266,10 @@ class ModelAdmin(BaseModelAdmin):
     def delete_view(self, request: HttpRequest, object_id: str, extra_context: None = ...) -> Any: ...
     def history_view(self, request: HttpRequest, object_id: str, extra_context: None = ...) -> HttpResponse: ...
 
-class InlineModelAdmin(BaseModelAdmin):
-    model: Any = ...
-    fk_name: Any = ...
-    formset: Any = ...
+class InlineModelAdmin(BaseModelAdmin[_ModelT]):
+    model: Type[_ModelT] = ...
+    fk_name: str = ...
+    formset: Type[BaseInlineFormSet] = ...
     extra: int = ...
     min_num: Optional[int] = ...
     max_num: Optional[int] = ...
@@ -241,18 +278,18 @@ class InlineModelAdmin(BaseModelAdmin):
     verbose_name_plural: Optional[str] = ...
     can_delete: bool = ...
     show_change_link: bool = ...
-    classes: Any = ...
-    admin_site: Any = ...
+    classes: Optional[Sequence[str]] = ...
+    admin_site: AdminSite = ...
     parent_model: Any = ...
     opts: Any = ...
     has_registered_model: Any = ...
-    def __init__(self, parent_model: Union[Type[Model], Model], admin_site: AdminSite) -> None: ...
+    def __init__(self, parent_model: Union[Type[_ModelT], _ModelT], admin_site: AdminSite) -> None: ...
     @property
     def media(self) -> Media: ...
-    def get_extra(self, request: HttpRequest, obj: Optional[Model] = ..., **kwargs: Any) -> int: ...
-    def get_min_num(self, request: HttpRequest, obj: Optional[Model] = ..., **kwargs: Any) -> Optional[int]: ...
-    def get_max_num(self, request: HttpRequest, obj: Optional[Model] = ..., **kwargs: Any) -> Optional[int]: ...
-    def get_formset(self, request: Any, obj: Optional[Any] = ..., **kwargs: Any): ...
+    def get_extra(self, request: HttpRequest, obj: Optional[_ModelT] = ..., **kwargs: Any) -> int: ...
+    def get_min_num(self, request: HttpRequest, obj: Optional[_ModelT] = ..., **kwargs: Any) -> Optional[int]: ...
+    def get_max_num(self, request: HttpRequest, obj: Optional[_ModelT] = ..., **kwargs: Any) -> Optional[int]: ...
+    def get_formset(self, request: Any, obj: Optional[_ModelT] = ..., **kwargs: Any): ...
 
-class StackedInline(InlineModelAdmin): ...
-class TabularInline(InlineModelAdmin): ...
+class StackedInline(InlineModelAdmin[_ModelT]): ...
+class TabularInline(InlineModelAdmin[_ModelT]): ...

django-stubs/contrib/admin/sites.pyi

@@ -1,66 +1,90 @@
-from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
+import sys
+from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type, Union
 
+from django.apps.config import AppConfig
 from django.contrib.admin.options import ModelAdmin
+from django.contrib.auth.forms import AuthenticationForm
 from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
+from django.db.models.query import QuerySet
 from django.http.response import HttpResponse
 from django.template.response import TemplateResponse
-from django.urls.resolvers import URLPattern, URLResolver
+from django.urls.resolvers import URLResolver
 from django.utils.functional import LazyObject
+from django.core.checks import CheckMessage
 
-all_sites: Any
+if sys.version_info >= (3, 9):
+    from weakref import WeakSet
+
+    all_sites: WeakSet[AdminSite]
+else:
+    from typing import MutableSet
+
+    all_sites: MutableSet[AdminSite]
+
+_ActionCallback = Callable[[ModelAdmin, WSGIRequest, QuerySet], Optional[TemplateResponse]]
 
 class AlreadyRegistered(Exception): ...
 class NotRegistered(Exception): ...
 
 class AdminSite:
-    site_title: Any = ...
-    site_header: Any = ...
-    index_title: Any = ...
+    site_title: str = ...
+    site_header: str = ...
+    index_title: str = ...
     site_url: str = ...
-    login_form: Any = ...
-    index_template: Any = ...
-    app_index_template: Any = ...
-    login_template: Any = ...
-    logout_template: Any = ...
-    password_change_template: Any = ...
-    password_change_done_template: Any = ...
+    login_form: Optional[AuthenticationForm] = ...
+    index_template: Optional[str] = ...
+    app_index_template: Optional[str] = ...
+    login_template: Optional[str] = ...
+    logout_template: Optional[str] = ...
+    password_change_template: Optional[str] = ...
+    password_change_done_template: Optional[str] = ...
     name: str = ...
+    _empty_value_display: str = ...
     _registry: Dict[Type[Model], ModelAdmin]
+    _global_actions: Dict[str, _ActionCallback]
+    _actions: Dict[str, _ActionCallback]
     def __init__(self, name: str = ...) -> None: ...
-    def check(self, app_configs: None) -> List[Any]: ...
+    def check(self, app_configs: Optional[Iterable[AppConfig]]) -> List[CheckMessage]: ...
     def register(
         self,
-        model_or_iterable: Union[List[Type[Model]], Tuple[Type[Model]], Type[Model]],
+        model_or_iterable: Union[Type[Model], Iterable[Type[Model]]],
         admin_class: Optional[Type[ModelAdmin]] = ...,
         **options: Any
     ) -> None: ...
-    def unregister(self, model_or_iterable: Type[Model]) -> None: ...
+    def unregister(self, model_or_iterable: Union[Type[Model], Iterable[Type[Model]]]) -> None: ...
     def is_registered(self, model: Type[Model]) -> bool: ...
-    def add_action(self, action: Callable, name: None = ...) -> None: ...
+    def add_action(self, action: _ActionCallback, name: Optional[str] = ...) -> None: ...
     def disable_action(self, name: str) -> None: ...
     def get_action(self, name: str) -> Callable: ...
     @property
-    def actions(self): ...
+    def actions(self) -> Iterable[Tuple[str, _ActionCallback]]: ...
     @property
-    def empty_value_display(self): ...
+    def empty_value_display(self) -> str: ...
     @empty_value_display.setter
-    def empty_value_display(self, empty_value_display: Any) -> None: ...
+    def empty_value_display(self, empty_value_display: str) -> None: ...
     def has_permission(self, request: WSGIRequest) -> bool: ...
     def admin_view(self, view: Callable, cacheable: bool = ...) -> Callable: ...
     def get_urls(self) -> List[URLResolver]: ...
     @property
     def urls(self) -> Tuple[List[URLResolver], str, str]: ...
-    def each_context(self, request: Any): ...
-    def password_change(self, request: WSGIRequest, extra_context: Dict[str, str] = ...) -> TemplateResponse: ...
-    def password_change_done(self, request: WSGIRequest, extra_context: None = ...) -> TemplateResponse: ...
-    def i18n_javascript(self, request: WSGIRequest, extra_context: Optional[Dict[Any, Any]] = ...) -> HttpResponse: ...
-    def logout(self, request: WSGIRequest, extra_context: None = ...) -> TemplateResponse: ...
-    def login(self, request: WSGIRequest, extra_context: None = ...) -> HttpResponse: ...
+    def each_context(self, request: WSGIRequest) -> Dict[str, Any]: ...
+    def password_change(
+        self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...
+    ) -> TemplateResponse: ...
+    def password_change_done(
+        self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...
+    ) -> TemplateResponse: ...
+    def i18n_javascript(self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...) -> HttpResponse: ...
+    def logout(self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...) -> TemplateResponse: ...
+    def login(self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...) -> HttpResponse: ...
+    def _build_app_dict(self, request: WSGIRequest, label: Optional[str] = ...) -> Dict[str, Any]: ...
     def get_app_list(self, request: WSGIRequest) -> List[Any]: ...
-    def index(self, request: WSGIRequest, extra_context: Optional[Dict[str, str]] = ...) -> TemplateResponse: ...
-    def app_index(self, request: WSGIRequest, app_label: str, extra_context: None = ...) -> TemplateResponse: ...
+    def index(self, request: WSGIRequest, extra_context: Optional[Dict[str, Any]] = ...) -> TemplateResponse: ...
+    def app_index(
+        self, request: WSGIRequest, app_label: str, extra_context: Optional[Dict[str, Any]] = ...
+    ) -> TemplateResponse: ...
 
 class DefaultAdminSite(LazyObject): ...
 
-site: Any
+site: AdminSite

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,7 +1,6 @@
-from typing import Any, Optional
+from typing import Any
 
 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, Optional
+from typing import Any
 
 register: Any
 

django-stubs/contrib/admin/utils.pyi

@@ -9,12 +9,10 @@ from django.contrib.auth.forms import AdminPasswordChangeForm
 from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
 from django.db.models.deletion import Collector
-from django.db.models.fields.mixins import FieldCacheMixin
 from django.db.models.fields.reverse_related import ManyToOneRel
 from django.db.models.options import Options
 from django.db.models.query import QuerySet
 from django.forms.forms import BaseForm
-from django.utils.safestring import SafeText
 
 from django.db.models.fields import Field, reverse_related
 
@@ -27,7 +25,7 @@ def unquote(s: str) -> str: ...
 def flatten(fields: Any) -> List[Union[Callable, str]]: ...
 def flatten_fieldsets(fieldsets: Any) -> List[Union[Callable, str]]: ...
 def get_deleted_objects(
-    objs: QuerySet, request: WSGIRequest, admin_site: AdminSite
+    objs: Sequence[Optional[Model]], request: WSGIRequest, admin_site: AdminSite
 ) -> Tuple[List[Any], Dict[Any, Any], Set[Any], List[Any]]: ...
 
 class NestedObjects(Collector):
@@ -41,22 +39,14 @@ class NestedObjects(Collector):
     model_objs: Any = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     def add_edge(self, source: Optional[Model], target: Model) -> None: ...
-    def collect(
-        self,
-        objs: Union[Sequence[Optional[Model]], QuerySet],
-        source: Optional[Type[Model]] = ...,
-        source_attr: Optional[str] = ...,
-        **kwargs: Any
-    ) -> None: ...
-    def related_objects(self, related: ManyToOneRel, objs: List[Model]) -> QuerySet: ...
-    def nested(self, format_callback: Callable = ...) -> Union[List[SafeText], List[int]]: ...
-    def can_fast_delete(self, *args: Any, **kwargs: Any) -> bool: ...
+    def related_objects(self, related: ManyToOneRel, objs: Sequence[Optional[Model]]) -> QuerySet: ...
+    def nested(self, format_callback: Callable = ...) -> List[Any]: ...
 
 def model_format_dict(obj: Any): ...
 def model_ngettext(obj: Union[Options, QuerySet], n: Optional[int] = ...) -> str: ...
 def lookup_field(
     name: Union[Callable, str], obj: Model, model_admin: BaseModelAdmin = ...
-) -> Tuple[Optional[Field], Callable, Callable]: ...
+) -> Tuple[Optional[Field], Any, Any]: ...
 def label_for_field(
     name: Union[Callable, str],
     model: Type[Model],
@@ -65,16 +55,14 @@ def label_for_field(
     form: Optional[BaseForm] = ...,
 ) -> Union[Tuple[Optional[str], Union[Callable, Type[str]]], str]: ...
 def help_text_for_field(name: str, model: Type[Model]) -> str: ...
-def display_for_field(
-    value: Any, field: Union[Field, reverse_related.OneToOneRel], empty_value_display: str
-) -> str: ...
+def display_for_field(value: Any, field: Field, empty_value_display: str) -> str: ...
 def display_for_value(value: Any, empty_value_display: str, boolean: bool = ...) -> str: ...
 
 class NotRelationField(Exception): ...
 
 def get_model_from_relation(field: Union[Field, reverse_related.ForeignObjectRel]) -> Type[Model]: ...
 def reverse_field_path(model: Type[Model], path: str) -> Tuple[Type[Model], str]: ...
-def get_fields_from_path(model: Type[Model], path: str) -> List[Union[Field, FieldCacheMixin]]: ...
+def get_fields_from_path(model: Type[Model], path: str) -> List[Field]: ...
 def construct_change_message(
     form: AdminPasswordChangeForm, formsets: None, add: bool
 ) -> List[Dict[str, Dict[str, List[str]]]]: ...

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

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

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

@@ -2,7 +2,11 @@ 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 ModelAdmin, IS_POPUP_VAR as IS_POPUP_VAR, TO_FIELD_VAR as TO_FIELD_VAR
+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.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
 from django.db.models.expressions import Combinable, CombinedExpression, OrderBy
@@ -77,9 +81,7 @@ 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
-    ) -> Union[List[Union[Combinable, str]], List[Union[OrderBy, str]]]: ...
+    def get_ordering(self, request: WSGIRequest, queryset: QuerySet) -> List[Union[OrderBy, Combinable, 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/apps.pyi

@@ -0,0 +1,6 @@
+from django.apps import AppConfig as AppConfig
+from typing import Any
+
+class AdminDocsConfig(AppConfig):
+    name: str = ...
+    verbose_name: Any = ...

django-stubs/contrib/admindocs/urls.pyi

@@ -0,0 +1,3 @@
+from typing import Any, List
+
+urlpatterns: List[Any] = ...

django-stubs/contrib/admindocs/views.pyi

@@ -3,46 +3,17 @@ 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):
-    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): ...
+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): ...
 
 def get_return_data_type(func_name: Any): ...
 def get_readable_field_data_type(field: Union[Field, str]) -> str: ...

django-stubs/contrib/auth/__init__.pyi

@@ -2,17 +2,16 @@ from typing import Any, List, Optional, Type, Union
 
 from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth.base_user import AbstractBaseUser
-from django.contrib.auth.models import AbstractUser, AnonymousUser
+from django.contrib.auth.models import AnonymousUser
 from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.base import Model
 from django.db.models.options import Options
 from django.http.request import HttpRequest
+from django.test.client import Client
 
-from .signals import (
-    user_logged_in as user_logged_in,
-    user_logged_out as user_logged_out,
-    user_login_failed as user_login_failed,
-)
+from .signals import user_logged_in as user_logged_in
+from .signals import user_logged_out as user_logged_out
+from .signals import user_login_failed as user_login_failed
 
 SESSION_KEY: str
 BACKEND_SESSION_KEY: str
@@ -23,12 +22,12 @@ def load_backend(path: str) -> ModelBackend: ...
 def get_backends() -> List[ModelBackend]: ...
 def authenticate(request: Any = ..., **credentials: Any) -> Optional[AbstractBaseUser]: ...
 def login(
-    request: HttpRequest, user: AbstractBaseUser, backend: Optional[Union[Type[ModelBackend], str]] = ...
+    request: HttpRequest, user: Optional[AbstractBaseUser], backend: Optional[Union[Type[ModelBackend], str]] = ...
 ) -> None: ...
 def logout(request: HttpRequest) -> None: ...
 def get_user_model() -> Type[Model]: ...
-def get_user(request: HttpRequest) -> Union[AbstractBaseUser, AnonymousUser]: ...
+def get_user(request: Union[HttpRequest, Client]) -> Union[AbstractBaseUser, AnonymousUser]: ...
 def get_permission_codename(action: str, opts: Options) -> str: ...
-def update_session_auth_hash(request: WSGIRequest, user: AbstractUser) -> None: ...
+def update_session_auth_hash(request: HttpRequest, user: AbstractBaseUser) -> None: ...
 
 default_app_config: str

django-stubs/contrib/auth/backends.pyi

@@ -1,29 +1,41 @@
 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.contrib.auth.models import AnonymousUser, User, Permission
+
+from django.db.models.base import Model
+from django.http.request import HttpRequest
+
+_AnyUser = Union[Model, AnonymousUser]
 
 UserModel: Any
 
-class ModelBackend:
+class BaseBackend:
     def authenticate(
-        self, request: Any, username: Optional[Union[int, str]] = ..., password: Optional[str] = ..., **kwargs: Any
+        self, request: HttpRequest, username: Optional[str] = ..., password: Optional[str] = ..., **kwargs: Any
     ) -> Optional[AbstractBaseUser]: ...
-    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: ...
+    def get_user(self, user_id: int) -> Optional[AbstractBaseUser]: ...
+    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: ...
+
+class ModelBackend(BaseBackend):
+    def has_module_perms(self, user_obj: _AnyUser, app_label: str) -> bool: ...
+    def user_can_authenticate(self, user: Optional[_AnyUser]) -> bool: ...
+    def with_perm(
+        self,
+        perm: Union[str, Permission],
+        is_active: bool = ...,
+        include_superusers: bool = ...,
+        obj: Optional[Model] = ...,
+    ): ...
 
 class AllowAllUsersModelBackend(ModelBackend): ...
 
 class RemoteUserBackend(ModelBackend):
     create_unknown_user: bool = ...
     def clean_username(self, username: str) -> str: ...
-    def configure_user(self, user: User) -> User: ...
+    def configure_user(self, request: HttpRequest, user: User) -> User: ...
 
 class AllowAllUsersRemoteUserBackend(RemoteUserBackend): ...

django-stubs/contrib/auth/base_user.pyi

@@ -1,9 +1,16 @@
-from typing import Any, Optional, Tuple, List, overload, TypeVar
+import sys
+from typing import Any, Optional, Tuple, List, overload, TypeVar, Union
 
 from django.db.models.base import Model
-
+from django.db.models.expressions import Combinable
+from django.db.models.fields import BooleanField
 from django.db import models
 
+if sys.version_info < (3, 8):
+    from typing_extensions import Literal
+else:
+    from typing import Literal
+
 _T = TypeVar("_T", bound=Model)
 
 class BaseUserManager(models.Manager[_T]):
@@ -13,20 +20,18 @@ class BaseUserManager(models.Manager[_T]):
     def get_by_natural_key(self, username: Optional[str]) -> _T: ...
 
 class AbstractBaseUser(models.Model):
-    password: models.CharField = ...
-    last_login: models.DateTimeField = ...
-    is_active: models.BooleanField = ...
     REQUIRED_FIELDS: List[str] = ...
-    class Meta: ...
+
+    password = models.CharField(max_length=128)
+    last_login = models.DateTimeField(blank=True, null=True)
+    is_active: Union[bool, BooleanField[Union[bool, Combinable], bool]] = ...
     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: ...
+    def is_anonymous(self) -> Literal[False]: ...
     @property
-    def is_authenticated(self) -> bool: ...
-    def set_password(self, raw_password: Optional[str]) -> None: ...
+    def is_authenticated(self) -> Literal[True]: ...
+    def set_password(self, raw_password: str) -> None: ...
     def check_password(self, raw_password: str) -> bool: ...
     def set_unusable_password(self) -> None: ...
     def has_usable_password(self) -> bool: ...

django-stubs/contrib/auth/checks.pyi

@@ -1,6 +1,8 @@
-from typing import Any, List
+from typing import Any, List, Optional, Sequence
 
 from django.core.checks.messages import CheckMessage
 
-def check_user_model(app_configs: None = ..., **kwargs: Any) -> List[CheckMessage]: ...
-def check_models_permissions(app_configs: None = ..., **kwargs: Any) -> List[Any]: ...
+from django.apps.config import AppConfig
+
+def check_user_model(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> List[CheckMessage]: ...
+def check_models_permissions(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> List[Any]: ...

django-stubs/contrib/auth/decorators.pyi

@@ -1,13 +1,21 @@
-from typing import Any, Callable, List, Optional, Set, Union
+from typing import Callable, List, Optional, Set, Union, TypeVar, overload
 
-from django.contrib.auth import REDIRECT_FIELD_NAME as REDIRECT_FIELD_NAME
+from django.contrib.auth import REDIRECT_FIELD_NAME as REDIRECT_FIELD_NAME  # noqa: F401
+from django.http.response import HttpResponseBase
+
+from django.contrib.auth.models import AbstractUser
+
+_VIEW = TypeVar("_VIEW", bound=Callable[..., HttpResponseBase])
 
 def user_passes_test(
-    test_func: Callable, login_url: Optional[str] = ..., redirect_field_name: str = ...
-) -> Callable: ...
-def login_required(
-    function: Optional[Callable] = ..., redirect_field_name: str = ..., login_url: Optional[str] = ...
-) -> Callable: ...
+    test_func: Callable[[AbstractUser], bool], login_url: Optional[str] = ..., redirect_field_name: str = ...
+) -> Callable[[_VIEW], _VIEW]: ...
+
+# There are two ways of calling @login_required: @with(arguments) and @bare
+@overload
+def login_required(redirect_field_name: str = ..., login_url: Optional[str] = ...) -> Callable[[_VIEW], _VIEW]: ...
+@overload
+def login_required(function: _VIEW, redirect_field_name: str = ..., login_url: Optional[str] = ...) -> _VIEW: ...
 def permission_required(
     perm: Union[List[str], Set[str], str], login_url: None = ..., raise_exception: bool = ...
-) -> Callable: ...
+) -> Callable[[_VIEW], _VIEW]: ...

django-stubs/contrib/auth/forms.pyi

@@ -1,7 +1,7 @@
 from typing import Any, Dict, Iterator, Optional
 
 from django.contrib.auth.base_user import AbstractBaseUser
-from django.contrib.auth.models import AbstractUser, User
+from django.contrib.auth.models import User
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
 from django.core.exceptions import ValidationError
 from django.core.handlers.wsgi import WSGIRequest
@@ -86,6 +86,6 @@ class AdminPasswordChangeForm(forms.Form):
     password1: Any = ...
     password2: Any = ...
     user: User = ...
-    def __init__(self, user: AbstractUser, *args: Any, **kwargs: Any) -> None: ...
+    def __init__(self, user: AbstractBaseUser, *args: Any, **kwargs: Any) -> None: ...
     def clean_password2(self) -> str: ...
-    def save(self, commit: bool = ...) -> AbstractUser: ...
+    def save(self, commit: bool = ...) -> AbstractBaseUser: ...

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

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

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

@@ -1,4 +1,4 @@
-import getpass as getpass
+import getpass as getpass  # noqa: F401
 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) -> None: ...
+    def test_func(self) -> Optional[bool]: ...
     def get_test_func(self) -> Callable: ...
     def dispatch(self, request: http.HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: ...

django-stubs/contrib/auth/models.pyi

@@ -1,5 +1,7 @@
-from typing import Any, Collection, Optional, Set, Tuple, Type, TypeVar
+import sys
+from typing import Any, Collection, Optional, Set, Tuple, Type, TypeVar, Union
 
+from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth.base_user import AbstractBaseUser as AbstractBaseUser, BaseUserManager as BaseUserManager
 from django.contrib.auth.validators import UnicodeUsernameValidator
 from django.contrib.contenttypes.models import ContentType
@@ -8,24 +10,35 @@ from django.db.models.manager import EmptyManager
 
 from django.db import models
 
+if sys.version_info < (3, 8):
+    from typing_extensions import Literal
+else:
+    from typing import Literal
+
+_AnyUser = Union[Model, "AnonymousUser"]
+
 def update_last_login(sender: Type[AbstractBaseUser], user: AbstractBaseUser, **kwargs: Any) -> None: ...
 
-class PermissionManager(models.Manager):
+class PermissionManager(models.Manager["Permission"]):
     def get_by_natural_key(self, codename: str, app_label: str, model: str) -> Permission: ...
 
 class Permission(models.Model):
     content_type_id: int
-    name: models.CharField = ...
-    content_type: models.ForeignKey = models.ForeignKey(ContentType, on_delete=models.CASCADE)
-    codename: models.CharField = ...
+    objects: PermissionManager
+
+    name = models.CharField(max_length=255)
+    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+    codename = models.CharField(max_length=100)
     def natural_key(self) -> Tuple[str, str, str]: ...
 
-class GroupManager(models.Manager):
+class GroupManager(models.Manager["Group"]):
     def get_by_natural_key(self, name: str) -> Group: ...
 
 class Group(models.Model):
-    name: models.CharField = ...
-    permissions: models.ManyToManyField = models.ManyToManyField(Permission)
+    objects: GroupManager
+
+    name = models.CharField(max_length=150)
+    permissions = models.ManyToManyField(Permission)
     def natural_key(self): ...
 
 _T = TypeVar("_T", bound=Model)
@@ -37,28 +50,39 @@ class UserManager(BaseUserManager[_T]):
     def create_superuser(
         self, username: str, email: Optional[str], password: Optional[str], **extra_fields: Any
     ) -> _T: ...
+    def with_perm(
+        self,
+        perm: Union[str, Permission],
+        is_active: bool = ...,
+        include_superusers: bool = ...,
+        backend: Optional[Union[Type[ModelBackend], str]] = ...,
+        obj: Optional[Model] = ...,
+    ): ...
 
 class PermissionsMixin(models.Model):
-    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: ...
+    is_superuser = models.BooleanField()
+    groups = models.ManyToManyField(Group)
+    user_permissions = models.ManyToManyField(Permission)
+    def get_user_permissions(self, obj: Optional[_AnyUser] = ...) -> Set[str]: ...
+    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: ...
     def has_module_perms(self, app_label: str) -> bool: ...
 
 class AbstractUser(AbstractBaseUser, PermissionsMixin):  # type: ignore
     username_validator: UnicodeUsernameValidator = ...
-    username: models.CharField = ...
-    first_name: models.CharField = ...
-    last_name: models.CharField = ...
-    email: models.EmailField = ...
-    is_staff: models.BooleanField = ...
-    date_joined: models.DateTimeField = ...
+
+    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()
+
     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: ...
@@ -80,13 +104,14 @@ class AnonymousUser:
     def groups(self) -> EmptyManager: ...
     @property
     def user_permissions(self) -> EmptyManager: ...
-    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 get_user_permissions(self, obj: Optional[_AnyUser] = ...) -> Set[str]: ...
+    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 has_module_perms(self, module: str) -> bool: ...
     @property
-    def is_anonymous(self) -> bool: ...
+    def is_anonymous(self) -> Literal[True]: ...
     @property
-    def is_authenticated(self) -> bool: ...
+    def is_authenticated(self) -> Literal[False]: ...
     def get_username(self) -> str: ...

django-stubs/contrib/auth/password_validation.pyi

@@ -1,7 +1,6 @@
 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/auth/tokens.pyi

@@ -1,3 +1,4 @@
+from datetime import date
 from typing import Any, Optional
 
 from django.contrib.auth.base_user import AbstractBaseUser
@@ -5,7 +6,12 @@ from django.contrib.auth.base_user import AbstractBaseUser
 class PasswordResetTokenGenerator:
     key_salt: str = ...
     secret: Any = ...
+    algorithm: str = ...
     def make_token(self, user: AbstractBaseUser) -> str: ...
     def check_token(self, user: Optional[AbstractBaseUser], token: Optional[str]) -> bool: ...
+    def _make_token_with_timestamp(self, user: AbstractBaseUser, timestamp: int) -> str: ...
+    def _make_hash_value(self, user: AbstractBaseUser, timestamp: int) -> str: ...
+    def _num_days(self, dt: date) -> float: ...
+    def _today(self) -> date: ...
 
 default_token_generator: Any

django-stubs/contrib/auth/views.pyi

@@ -1,6 +1,7 @@
 from typing import Any, Optional, Set
 
 from django.contrib.auth.base_user import AbstractBaseUser
+from django.contrib.auth.forms import AuthenticationForm
 from django.core.handlers.wsgi import WSGIRequest
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseRedirect
@@ -14,7 +15,7 @@ class SuccessURLAllowedHostsMixin:
     success_url_allowed_hosts: Any = ...
     def get_success_url_allowed_hosts(self) -> Set[str]: ...
 
-class LoginView(SuccessURLAllowedHostsMixin, FormView):
+class LoginView(SuccessURLAllowedHostsMixin, FormView[AuthenticationForm]):
     authentication_form: Any = ...
     redirect_field_name: Any = ...
     redirect_authenticated_user: bool = ...
@@ -55,6 +56,7 @@ class PasswordResetDoneView(PasswordContextMixin, TemplateView):
 class PasswordResetConfirmView(PasswordContextMixin, FormView):
     post_reset_login: bool = ...
     post_reset_login_backend: Any = ...
+    reset_url_token: str = ...
     title: Any = ...
     token_generator: Any = ...
     validlink: bool = ...

django-stubs/contrib/contenttypes/checks.pyi

@@ -1,4 +1,6 @@
-from typing import Any, List, Optional
+from typing import Any, List, Optional, Sequence
 
-def check_generic_foreign_keys(app_configs: None = ..., **kwargs: Any) -> List[Any]: ...
-def check_model_name_lengths(app_configs: None = ..., **kwargs: Any) -> List[Any]: ...
+from django.apps.config import AppConfig
+
+def check_generic_foreign_keys(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> List[Any]: ...
+def check_model_name_lengths(app_configs: Optional[Sequence[AppConfig]] = ..., **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, Generic
+from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
 
 from django.contrib.contenttypes.models import ContentType
-from django.core.checks.messages import Error
+from django.core.checks.messages import CheckMessage
 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]
@@ -41,7 +41,7 @@ class GenericForeignKey(FieldCacheMixin):
     def contribute_to_class(self, cls: Type[Model], name: str, **kwargs: Any) -> None: ...
     def get_filter_kwargs_for_object(self, obj: Model) -> Dict[str, Optional[ContentType]]: ...
     def get_forward_related_filter(self, obj: Model) -> Dict[str, int]: ...
-    def check(self, **kwargs: Any) -> List[Error]: ...
+    def check(self, **kwargs: Any) -> List[CheckMessage]: ...
     def get_cache_name(self) -> str: ...
     def get_content_type(
         self, obj: Optional[Model] = ..., id: Optional[int] = ..., using: Optional[str] = ...
@@ -83,7 +83,6 @@ class GenericRelation(ForeignObject):
     def resolve_related_fields(self) -> List[Tuple[PositiveIntegerField, Field]]: ...
     def get_path_info(self, filtered_relation: Optional[FilteredRelation] = ...) -> List[PathInfo]: ...
     def get_reverse_path_info(self, filtered_relation: None = ...) -> List[PathInfo]: ...
-    def value_to_string(self, obj: Model) -> str: ...
     def get_content_type(self) -> ContentType: ...
     def get_extra_restriction(
         self, where_class: Type[WhereNode], alias: Optional[str], remote_alias: str

django-stubs/contrib/contenttypes/views.pyi

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

django-stubs/contrib/flatpages/admin.pyi

@@ -0,0 +1,9 @@
+from django.contrib import admin as admin
+from typing import Any
+
+class FlatPageAdmin(admin.ModelAdmin):
+    form: Any = ...
+    fieldsets: Any = ...
+    list_display: Any = ...
+    list_filter: Any = ...
+    search_fields: Any = ...

django-stubs/contrib/flatpages/apps.pyi

@@ -0,0 +1,6 @@
+from django.apps import AppConfig as AppConfig
+from typing import Any
+
+class FlatPagesConfig(AppConfig):
+    name: str = ...
+    verbose_name: Any = ...

django-stubs/contrib/flatpages/urls.pyi

@@ -0,0 +1,3 @@
+from typing import Any, List
+
+urlpatterns: List[Any] = ...

django-stubs/contrib/flatpages/views.pyi

@@ -1,5 +1,3 @@
-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/__init__.pyi

@@ -0,0 +1 @@
+default_app_config: str

django-stubs/contrib/gis/admin/__init__.pyi

@@ -0,0 +1,12 @@
+from django.contrib.admin import (
+    AdminSite as AdminSite,
+    HORIZONTAL as HORIZONTAL,
+    ModelAdmin as ModelAdmin,
+    StackedInline as StackedInline,
+    TabularInline as TabularInline,
+    VERTICAL as VERTICAL,
+    autodiscover as autodiscover,
+    register as register,
+    site as site,
+)
+from django.contrib.gis.admin.options import GeoModelAdmin as GeoModelAdmin, OSMGeoAdmin as OSMGeoAdmin

django-stubs/contrib/gis/admin/options.pyi

@@ -0,0 +1,45 @@
+from django.contrib.admin import ModelAdmin as ModelAdmin
+from typing import Any
+
+spherical_mercator_srid: int
+
+class GeoModelAdmin(ModelAdmin):
+    default_lon: int = ...
+    default_lat: int = ...
+    default_zoom: int = ...
+    display_wkt: bool = ...
+    display_srid: bool = ...
+    extra_js: Any = ...
+    num_zoom: int = ...
+    max_zoom: bool = ...
+    min_zoom: bool = ...
+    units: bool = ...
+    max_resolution: bool = ...
+    max_extent: bool = ...
+    modifiable: bool = ...
+    mouse_position: bool = ...
+    scale_text: bool = ...
+    layerswitcher: bool = ...
+    scrollable: bool = ...
+    map_width: int = ...
+    map_height: int = ...
+    map_srid: int = ...
+    map_template: str = ...
+    openlayers_url: str = ...
+    point_zoom: Any = ...
+    wms_url: str = ...
+    wms_layer: str = ...
+    wms_name: str = ...
+    wms_options: Any = ...
+    debug: bool = ...
+    widget: Any = ...
+    @property
+    def media(self): ...
+    def formfield_for_dbfield(self, db_field: Any, request: Any, **kwargs: Any): ...
+    def get_map_widget(self, db_field: Any): ...
+
+class OSMGeoAdmin(GeoModelAdmin):
+    map_template: str = ...
+    num_zoom: int = ...
+    map_srid: Any = ...
+    point_zoom: Any = ...

django-stubs/contrib/gis/admin/widgets.pyi

@@ -0,0 +1,9 @@
+from django.forms.widgets import Textarea as Textarea
+from typing import Any
+
+geo_context: Any
+logger: Any
+
+class OpenLayersWidget(Textarea):
+    def get_context(self, name: Any, value: Any, attrs: Any): ...
+    def map_options(self): ...

django-stubs/contrib/gis/apps.pyi

@@ -0,0 +1,7 @@
+from django.apps import AppConfig as AppConfig
+from typing import Any
+
+class GISConfig(AppConfig):
+    name: str = ...
+    verbose_name: Any = ...
+    def ready(self) -> None: ...

django-stubs/contrib/gis/db/backends/base/adapter.pyi

@@ -0,0 +1,8 @@
+from typing import Any
+
+class WKTAdapter:
+    wkt: Any = ...
+    srid: Any = ...
+    def __init__(self, geom: Any) -> None: ...
+    def __eq__(self, other: Any) -> Any: ...
+    def __hash__(self) -> Any: ...

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

@@ -0,0 +1,44 @@
+from typing import Any
+
+class BaseSpatialFeatures:
+    gis_enabled: bool = ...
+    has_spatialrefsys_table: bool = ...
+    supports_add_srs_entry: bool = ...
+    supports_geometry_field_introspection: bool = ...
+    supports_3d_storage: bool = ...
+    supports_3d_functions: bool = ...
+    supports_transform: bool = ...
+    supports_null_geometries: bool = ...
+    supports_empty_geometries: bool = ...
+    supports_distance_geodetic: bool = ...
+    supports_length_geodetic: bool = ...
+    supports_perimeter_geodetic: bool = ...
+    supports_area_geodetic: bool = ...
+    supports_num_points_poly: bool = ...
+    supports_left_right_lookups: bool = ...
+    supports_dwithin_distance_expr: bool = ...
+    supports_raster: bool = ...
+    supports_geometry_field_unique_index: bool = ...
+    @property
+    def supports_bbcontains_lookup(self): ...
+    @property
+    def supports_contained_lookup(self): ...
+    @property
+    def supports_crosses_lookup(self): ...
+    @property
+    def supports_distances_lookups(self): ...
+    @property
+    def supports_dwithin_lookup(self): ...
+    @property
+    def supports_relate_lookup(self): ...
+    @property
+    def supports_isvalid_lookup(self): ...
+    @property
+    def supports_collect_aggr(self): ...
+    @property
+    def supports_extent_aggr(self): ...
+    @property
+    def supports_make_line_aggr(self): ...
+    @property
+    def supports_union_aggr(self): ...
+    def __getattr__(self, name: Any): ...

django-stubs/contrib/gis/db/backends/base/models.pyi

@@ -0,0 +1,33 @@
+from typing import Any
+
+class SpatialRefSysMixin:
+    @property
+    def srs(self): ...
+    @property
+    def ellipsoid(self): ...
+    @property
+    def name(self): ...
+    @property
+    def spheroid(self): ...
+    @property
+    def datum(self): ...
+    @property
+    def projected(self): ...
+    @property
+    def local(self): ...
+    @property
+    def geographic(self): ...
+    @property
+    def linear_name(self): ...
+    @property
+    def linear_units(self): ...
+    @property
+    def angular_name(self): ...
+    @property
+    def angular_units(self): ...
+    @property
+    def units(self): ...
+    @classmethod
+    def get_units(cls, wkt: Any): ...
+    @classmethod
+    def get_spheroid(cls, wkt: Any, string: bool = ...): ...

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

@@ -0,0 +1,33 @@
+from typing import Any
+
+class BaseSpatialOperations:
+    postgis: bool = ...
+    spatialite: bool = ...
+    mysql: bool = ...
+    oracle: bool = ...
+    spatial_version: Any = ...
+    select: str = ...
+    def select_extent(self): ...
+    geography: bool = ...
+    geometry: bool = ...
+    disallowed_aggregates: Any = ...
+    geom_func_prefix: str = ...
+    function_names: Any = ...
+    unsupported_functions: Any = ...
+    from_text: bool = ...
+    def convert_extent(self, box: Any, srid: Any) -> None: ...
+    def convert_extent3d(self, box: Any, srid: Any) -> None: ...
+    def geo_quote_name(self, name: Any): ...
+    def geo_db_type(self, f: Any) -> None: ...
+    def get_distance(self, f: Any, value: Any, lookup_type: Any) -> None: ...
+    def get_geom_placeholder(self, f: Any, value: Any, compiler: Any): ...
+    def check_expression_support(self, expression: Any) -> None: ...
+    def spatial_aggregate_name(self, agg_name: Any) -> None: ...
+    def spatial_function_name(self, func_name: Any): ...
+    def geometry_columns(self) -> None: ...
+    def spatial_ref_sys(self) -> None: ...
+    distance_expr_for_lookup: Any = ...
+    def get_db_converters(self, expression: Any): ...
+    def get_geometry_converter(self, expression: Any) -> None: ...
+    def get_area_att_for_field(self, field: Any): ...
+    def get_distance_att_for_field(self, field: Any): ...

django-stubs/contrib/gis/db/backends/mysql/base.pyi

@@ -0,0 +1,8 @@
+from django.db.backends.mysql.base import DatabaseWrapper as MySQLDatabaseWrapper
+from typing import Any
+
+class DatabaseWrapper(MySQLDatabaseWrapper):
+    SchemaEditorClass: Any = ...
+    features_class: Any = ...
+    introspection_class: Any = ...
+    ops_class: Any = ...

django-stubs/contrib/gis/db/backends/mysql/features.pyi

@@ -0,0 +1,14 @@
+from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures as BaseSpatialFeatures
+from django.db.backends.mysql.features import DatabaseFeatures as MySQLDatabaseFeatures
+
+class DatabaseFeatures(BaseSpatialFeatures, MySQLDatabaseFeatures):
+    has_spatialrefsys_table: bool = ...
+    supports_add_srs_entry: bool = ...
+    supports_distance_geodetic: bool = ...
+    supports_length_geodetic: bool = ...
+    supports_area_geodetic: bool = ...
+    supports_transform: bool = ...
+    supports_null_geometries: bool = ...
+    supports_num_points_poly: bool = ...
+    def supports_empty_geometry_collection(self): ...
+    def supports_geometry_field_unique_index(self): ...

django-stubs/contrib/gis/db/backends/mysql/introspection.pyi

@@ -0,0 +1,7 @@
+from django.db.backends.mysql.introspection import DatabaseIntrospection as DatabaseIntrospection
+from typing import Any
+
+class MySQLIntrospection(DatabaseIntrospection):
+    data_types_reverse: Any = ...
+    def get_geometry_type(self, table_name: Any, description: Any): ...
+    def supports_spatial_index(self, cursor: Any, table_name: Any): ...

django-stubs/contrib/gis/db/backends/mysql/operations.pyi

@@ -0,0 +1,17 @@
+from django.contrib.gis.db.backends.base.operations import BaseSpatialOperations as BaseSpatialOperations
+from django.db.backends.mysql.operations import DatabaseOperations as DatabaseOperations
+from typing import Any
+
+class MySQLOperations(BaseSpatialOperations, DatabaseOperations):
+    mysql: bool = ...
+    name: str = ...
+    geom_func_prefix: str = ...
+    Adapter: Any = ...
+    def select(self): ...
+    def from_text(self): ...
+    def gis_operators(self): ...
+    disallowed_aggregates: Any = ...
+    def unsupported_functions(self): ...
+    def geo_db_type(self, f: Any): ...
+    def get_distance(self, f: Any, value: Any, lookup_type: Any): ...
+    def get_geometry_converter(self, expression: Any): ...

django-stubs/contrib/gis/db/backends/mysql/schema.pyi

@@ -0,0 +1,16 @@
+from django.db.backends.mysql.schema import DatabaseSchemaEditor as DatabaseSchemaEditor
+from typing import Any
+
+logger: Any
+
+class MySQLGISSchemaEditor(DatabaseSchemaEditor):
+    sql_add_spatial_index: str = ...
+    sql_drop_spatial_index: str = ...
+    geometry_sql: Any = ...
+    def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+    def skip_default(self, field: Any): ...
+    def column_sql(self, model: Any, field: Any, include_default: bool = ...): ...
+    def create_model(self, model: Any) -> None: ...
+    def add_field(self, model: Any, field: Any) -> None: ...
+    def remove_field(self, model: Any, field: Any) -> None: ...
+    def create_spatial_indexes(self) -> None: ...

django-stubs/contrib/gis/db/backends/oracle/adapter.pyi

@@ -0,0 +1,8 @@
+from django.contrib.gis.db.backends.base.adapter import WKTAdapter
+from typing import Any
+
+class OracleSpatialAdapter(WKTAdapter):
+    input_size: Any = ...
+    wkt: Any = ...
+    srid: Any = ...
+    def __init__(self, geom: Any) -> None: ...

django-stubs/contrib/gis/db/backends/oracle/base.pyi

@@ -0,0 +1,8 @@
+from django.db.backends.oracle.base import DatabaseWrapper as OracleDatabaseWrapper
+from typing import Any
+
+class DatabaseWrapper(OracleDatabaseWrapper):
+    SchemaEditorClass: Any = ...
+    features_class: Any = ...
+    introspection_class: Any = ...
+    ops_class: Any = ...

django-stubs/contrib/gis/db/backends/oracle/features.pyi

@@ -0,0 +1,9 @@
+from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures as BaseSpatialFeatures
+from django.db.backends.oracle.features import DatabaseFeatures as OracleDatabaseFeatures
+
+class DatabaseFeatures(BaseSpatialFeatures, OracleDatabaseFeatures):
+    supports_add_srs_entry: bool = ...
+    supports_geometry_field_introspection: bool = ...
+    supports_geometry_field_unique_index: bool = ...
+    supports_perimeter_geodetic: bool = ...
+    supports_dwithin_distance_expr: bool = ...

django-stubs/contrib/gis/db/backends/oracle/introspection.pyi

@@ -0,0 +1,6 @@
+from django.db.backends.oracle.introspection import DatabaseIntrospection as DatabaseIntrospection
+from typing import Any
+
+class OracleIntrospection(DatabaseIntrospection):
+    def data_types_reverse(self): ...
+    def get_geometry_type(self, table_name: Any, description: Any): ...

django-stubs/contrib/gis/db/backends/oracle/models.pyi

@@ -0,0 +1,30 @@
+from django.contrib.gis.db import models as models
+from django.contrib.gis.db.backends.base.models import SpatialRefSysMixin as SpatialRefSysMixin
+from typing import Any
+
+class OracleGeometryColumns(models.Model):
+    table_name: Any = ...
+    column_name: Any = ...
+    srid: Any = ...
+    class Meta:
+        app_label: str = ...
+        db_table: str = ...
+        managed: bool = ...
+    @classmethod
+    def table_name_col(cls): ...
+    @classmethod
+    def geom_col_name(cls): ...
+
+class OracleSpatialRefSys(models.Model, SpatialRefSysMixin):
+    cs_name: Any = ...
+    srid: Any = ...
+    auth_srid: Any = ...
+    auth_name: Any = ...
+    wktext: Any = ...
+    cs_bounds: Any = ...
+    class Meta:
+        app_label: str = ...
+        db_table: str = ...
+        managed: bool = ...
+    @property
+    def wkt(self): ...

django-stubs/contrib/gis/db/backends/oracle/operations.pyi

@@ -0,0 +1,42 @@
+from django.contrib.gis.db.backends.base.operations import BaseSpatialOperations as BaseSpatialOperations
+from django.contrib.gis.db.backends.utils import SpatialOperator as SpatialOperator
+from django.db.backends.oracle.operations import DatabaseOperations as DatabaseOperations
+from typing import Any
+
+DEFAULT_TOLERANCE: str
+
+class SDOOperator(SpatialOperator):
+    sql_template: str = ...
+
+class SDODWithin(SpatialOperator):
+    sql_template: str = ...
+
+class SDODisjoint(SpatialOperator):
+    sql_template: Any = ...
+
+class SDORelate(SpatialOperator):
+    sql_template: str = ...
+    def check_relate_argument(self, arg: Any) -> None: ...
+    def as_sql(self, connection: Any, lookup: Any, template_params: Any, sql_params: Any): ...
+
+class OracleOperations(BaseSpatialOperations, DatabaseOperations):
+    name: str = ...
+    oracle: bool = ...
+    disallowed_aggregates: Any = ...
+    Adapter: Any = ...
+    extent: str = ...
+    unionagg: str = ...
+    function_names: Any = ...
+    select: str = ...
+    gis_operators: Any = ...
+    unsupported_functions: Any = ...
+    def geo_quote_name(self, name: Any): ...
+    def geo_db_type(self, f: Any): ...
+    def get_distance(self, f: Any, value: Any, lookup_type: Any): ...
+    def get_geom_placeholder(self, f: Any, value: Any, compiler: Any): ...
+    def spatial_aggregate_name(self, agg_name: Any): ...
+    def geometry_columns(self): ...
+    def spatial_ref_sys(self): ...
+    def modify_insert_params(self, placeholder: Any, params: Any): ...
+    def get_geometry_converter(self, expression: Any): ...
+    def get_area_att_for_field(self, field: Any): ...

django-stubs/contrib/gis/db/backends/oracle/schema.pyi

@@ -0,0 +1,18 @@
+from django.db.backends.oracle.schema import DatabaseSchemaEditor
+from typing import Any
+
+class OracleGISSchemaEditor(DatabaseSchemaEditor):
+    sql_add_geometry_metadata: str = ...
+    sql_add_spatial_index: str = ...
+    sql_drop_spatial_index: str = ...
+    sql_clear_geometry_table_metadata: str = ...
+    sql_clear_geometry_field_metadata: str = ...
+    geometry_sql: Any = ...
+    def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+    def geo_quote_name(self, name: Any): ...
+    def column_sql(self, model: Any, field: Any, include_default: bool = ...): ...
+    def create_model(self, model: Any) -> None: ...
+    def delete_model(self, model: Any) -> None: ...
+    def add_field(self, model: Any, field: Any) -> None: ...
+    def remove_field(self, model: Any, field: Any) -> None: ...
+    def run_geometry_sql(self) -> None: ...

django-stubs/contrib/gis/db/backends/postgis/adapter.pyi

@@ -0,0 +1,13 @@
+from typing import Any
+
+class PostGISAdapter:
+    is_geometry: Any = ...
+    ewkb: Any = ...
+    srid: Any = ...
+    geography: Any = ...
+    def __init__(self, obj: Any, geography: bool = ...) -> None: ...
+    def __conform__(self, proto: Any): ...
+    def __eq__(self, other: Any) -> Any: ...
+    def __hash__(self) -> Any: ...
+    def prepare(self, conn: Any) -> None: ...
+    def getquoted(self): ...

django-stubs/contrib/gis/db/backends/postgis/base.pyi

@@ -0,0 +1,10 @@
+from django.db.backends.postgresql.base import DatabaseWrapper as Psycopg2DatabaseWrapper
+from typing import Any
+
+class DatabaseWrapper(Psycopg2DatabaseWrapper):
+    SchemaEditorClass: Any = ...
+    features: Any = ...
+    ops: Any = ...
+    introspection: Any = ...
+    def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+    def prepare_database(self) -> None: ...

django-stubs/contrib/gis/db/backends/postgis/const.pyi

@@ -0,0 +1,9 @@
+from typing import Any
+
+GDAL_TO_POSTGIS: Any
+POSTGIS_TO_GDAL: Any
+POSTGIS_HEADER_STRUCTURE: str
+GDAL_TO_STRUCT: Any
+STRUCT_SIZE: Any
+BANDTYPE_PIXTYPE_MASK: int
+BANDTYPE_FLAG_HASNODATA: Any

django-stubs/contrib/gis/db/backends/postgis/features.pyi

@@ -0,0 +1,9 @@
+from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures as BaseSpatialFeatures
+from django.db.backends.postgresql.features import DatabaseFeatures as Psycopg2DatabaseFeatures
+
+class DatabaseFeatures(BaseSpatialFeatures, Psycopg2DatabaseFeatures):
+    supports_3d_storage: bool = ...
+    supports_3d_functions: bool = ...
+    supports_left_right_lookups: bool = ...
+    supports_raster: bool = ...
+    supports_empty_geometries: bool = ...

django-stubs/contrib/gis/db/backends/postgis/introspection.pyi

@@ -0,0 +1,8 @@
+from django.db.backends.postgresql.introspection import DatabaseIntrospection as DatabaseIntrospection
+from typing import Any
+
+class PostGISIntrospection(DatabaseIntrospection):
+    postgis_oid_lookup: Any = ...
+    ignored_tables: Any = ...
+    def get_field_type(self, data_type: Any, description: Any): ...
+    def get_geometry_type(self, table_name: Any, description: Any): ...

django-stubs/contrib/gis/db/backends/postgis/models.pyi

@@ -0,0 +1,33 @@
+from django.contrib.gis.db.backends.base.models import SpatialRefSysMixin as SpatialRefSysMixin
+from django.db import models as models
+from typing import Any
+
+class PostGISGeometryColumns(models.Model):
+    f_table_catalog: Any = ...
+    f_table_schema: Any = ...
+    f_table_name: Any = ...
+    f_geometry_column: Any = ...
+    coord_dimension: Any = ...
+    srid: Any = ...
+    type: Any = ...
+    class Meta:
+        app_label: str = ...
+        db_table: str = ...
+        managed: bool = ...
+    @classmethod
+    def table_name_col(cls): ...
+    @classmethod
+    def geom_col_name(cls): ...
+
+class PostGISSpatialRefSys(models.Model, SpatialRefSysMixin):
+    srid: Any = ...
+    auth_name: Any = ...
+    auth_srid: Any = ...
+    srtext: Any = ...
+    proj4text: Any = ...
+    class Meta:
+        app_label: str = ...
+        db_table: str = ...
+        managed: bool = ...
+    @property
+    def wkt(self): ...

django-stubs/contrib/gis/db/backends/postgis/operations.pyi

@@ -0,0 +1,56 @@
+from django.contrib.gis.db.backends.base.operations import BaseSpatialOperations
+from django.contrib.gis.db.backends.utils import SpatialOperator
+from django.db.backends.postgresql.operations import DatabaseOperations
+from django.db.models import Func
+from typing import Any
+
+BILATERAL: str
+
+class PostGISOperator(SpatialOperator):
+    geography: Any = ...
+    raster: Any = ...
+    def __init__(self, geography: bool = ..., raster: bool = ..., **kwargs: Any) -> None: ...
+    def as_sql(self, connection: Any, lookup: Any, template_params: Any, *args: Any): ...
+    def check_raster(self, lookup: Any, template_params: Any): ...
+
+class ST_Polygon(Func):
+    function: str = ...
+    def __init__(self, expr: Any) -> None: ...
+    def output_field(self): ...
+
+class PostGISOperations(BaseSpatialOperations, DatabaseOperations):
+    name: str = ...
+    postgis: bool = ...
+    geography: bool = ...
+    geom_func_prefix: str = ...
+    Adapter: Any = ...
+    collect: Any = ...
+    extent: Any = ...
+    extent3d: Any = ...
+    length3d: Any = ...
+    makeline: Any = ...
+    perimeter3d: Any = ...
+    unionagg: Any = ...
+    gis_operators: Any = ...
+    unsupported_functions: Any = ...
+    select: str = ...
+    select_extent: Any = ...
+    def function_names(self): ...
+    def spatial_version(self): ...
+    def geo_db_type(self, f: Any): ...
+    def get_distance(self, f: Any, dist_val: Any, lookup_type: Any): ...
+    def get_geom_placeholder(self, f: Any, value: Any, compiler: Any): ...
+    def postgis_geos_version(self): ...
+    def postgis_lib_version(self): ...
+    def postgis_proj_version(self): ...
+    def postgis_version(self): ...
+    def postgis_full_version(self): ...
+    def postgis_version_tuple(self): ...
+    def proj_version_tuple(self): ...
+    def spatial_aggregate_name(self, agg_name: Any): ...
+    def geometry_columns(self): ...
+    def spatial_ref_sys(self): ...
+    def parse_raster(self, value: Any): ...
+    def distance_expr_for_lookup(self, lhs: Any, rhs: Any, **kwargs: Any): ...
+    def get_geometry_converter(self, expression: Any): ...
+    def get_area_att_for_field(self, field: Any): ...

django-stubs/contrib/gis/db/backends/postgis/pgraster.pyi

@@ -0,0 +1,7 @@
+from typing import Any
+
+def pack(structure: Any, data: Any): ...
+def unpack(structure: Any, data: Any): ...
+def chunk(data: Any, index: Any): ...
+def from_pgraster(data: Any): ...
+def to_pgraster(rast: Any): ...

django-stubs/contrib/gis/db/backends/postgis/schema.pyi

@@ -0,0 +1,10 @@
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
+from typing import Any
+
+class PostGISSchemaEditor(DatabaseSchemaEditor):
+    geom_index_type: str = ...
+    geom_index_ops_nd: str = ...
+    rast_index_wrapper: str = ...
+    sql_alter_column_to_3d: str = ...
+    sql_alter_column_to_2d: str = ...
+    def geo_quote_name(self, name: Any): ...

django-stubs/contrib/gis/db/backends/spatialite/adapter.pyi

@@ -0,0 +1,5 @@
+from django.contrib.gis.db.backends.base.adapter import WKTAdapter as WKTAdapter
+from typing import Any
+
+class SpatiaLiteAdapter(WKTAdapter):
+    def __conform__(self, protocol: Any): ...

django-stubs/contrib/gis/db/backends/spatialite/base.pyi

@@ -0,0 +1,13 @@
+from django.db.backends.sqlite3.base import DatabaseWrapper as SQLiteDatabaseWrapper
+from typing import Any
+
+class DatabaseWrapper(SQLiteDatabaseWrapper):
+    SchemaEditorClass: Any = ...
+    client_class: Any = ...
+    features_class: Any = ...
+    introspection_class: Any = ...
+    ops_class: Any = ...
+    lib_spatialite_paths: Any = ...
+    def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+    def get_new_connection(self, conn_params: Any): ...
+    def prepare_database(self) -> None: ...

django-stubs/contrib/gis/db/backends/spatialite/client.pyi

@@ -0,0 +1,4 @@
+from django.db.backends.sqlite3.client import DatabaseClient as DatabaseClient
+
+class SpatiaLiteClient(DatabaseClient):
+    executable_name: str = ...

django-stubs/contrib/gis/db/backends/spatialite/features.pyi

@@ -0,0 +1,6 @@
+from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures as BaseSpatialFeatures
+from django.db.backends.sqlite3.features import DatabaseFeatures as SQLiteDatabaseFeatures
+
+class DatabaseFeatures(BaseSpatialFeatures, SQLiteDatabaseFeatures):
+    supports_3d_storage: bool = ...
+    def supports_area_geodetic(self): ...

django-stubs/contrib/gis/db/backends/spatialite/introspection.pyi

@@ -0,0 +1,13 @@
+from django.db.backends.sqlite3.introspection import (
+    DatabaseIntrospection as DatabaseIntrospection,
+    FlexibleFieldLookupDict as FlexibleFieldLookupDict,
+)
+from typing import Any
+
+class GeoFlexibleFieldLookupDict(FlexibleFieldLookupDict):
+    base_data_types_reverse: Any = ...
+
+class SpatiaLiteIntrospection(DatabaseIntrospection):
+    data_types_reverse: Any = ...
+    def get_geometry_type(self, table_name: Any, description: Any): ...
+    def get_constraints(self, cursor: Any, table_name: Any): ...

django-stubs/contrib/gis/db/backends/spatialite/models.pyi

@@ -0,0 +1,33 @@
+from django.contrib.gis.db.backends.base.models import SpatialRefSysMixin as SpatialRefSysMixin
+from django.db import models as models
+from typing import Any
+
+class SpatialiteGeometryColumns(models.Model):
+    f_table_name: Any = ...
+    f_geometry_column: Any = ...
+    coord_dimension: Any = ...
+    srid: Any = ...
+    spatial_index_enabled: Any = ...
+    type: Any = ...
+    class Meta:
+        app_label: str = ...
+        db_table: str = ...
+        managed: bool = ...
+    @classmethod
+    def table_name_col(cls): ...
+    @classmethod
+    def geom_col_name(cls): ...
+
+class SpatialiteSpatialRefSys(models.Model, SpatialRefSysMixin):
+    srid: Any = ...
+    auth_name: Any = ...
+    auth_srid: Any = ...
+    ref_sys_name: Any = ...
+    proj4text: Any = ...
+    srtext: Any = ...
+    class Meta:
+        app_label: str = ...
+        db_table: str = ...
+        managed: bool = ...
+    @property
+    def wkt(self): ...