Merge branch 'master' of https://github.com/FallenDeity/django-stubs into feat/builtin-models-types

Author: FallenDeity

.github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13']
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13']
         shard: [0, 1, 2, 3]
       fail-fast: false
     steps:
@@ -132,13 +132,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.11', '3.12', '3.13']
-        django-version: ['4.2', '5.0', '5.1']
-        include:
-          - python-version: '3.9'
-            django-version: '4.2'
-          - python-version: '3.10'
-            django-version: '4.2'
+        python-version: ['3.10', '3.11', '3.12', '3.13']
+        django-version: ['5.0', '5.1', '5.2']
     steps:
       - uses: actions/checkout@v4
       - name: Setup system dependencies

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
         args: [--fix=lf]
       - id: check-case-conflict
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.2
+    rev: v0.11.4
     hooks:
       - id: ruff
         args: ["--fix", "--exit-non-zero-on-fix"]

README.md

@@ -167,7 +167,7 @@ This happens because these Django classes do not support [`__class_getitem__`](h
 
 ### How can I create a HttpRequest that's guaranteed to have an authenticated user?
 
-Django's built in [`HttpRequest`](https://docs.djangoproject.com/en/4.1/ref/request-response/#django.http.HttpRequest) has the attribute `user` that resolves to the type
+Django's built in [`HttpRequest`](https://docs.djangoproject.com/en/5.2/ref/request-response/#django.http.HttpRequest) has the attribute `user` that resolves to the type
 
 ```python
 Union[User, AnonymousUser]
@@ -259,7 +259,7 @@ func(MyModel.objects.annotate(bar=Value("")).get(id=1))  # Error
 
 The lazy translation functions of Django (such as `gettext_lazy`) return a `Promise` instead of `str`. These two types [cannot be used interchangeably](https://github.com/typeddjango/django-stubs/pull/1139#issuecomment-1232167698). The return type of these functions was therefore [changed](https://github.com/typeddjango/django-stubs/pull/689) to reflect that.
 
-If you encounter this error in your own code, you can either cast the `Promise` to `str` (causing the translation to be evaluated), or use the `StrPromise` or `StrOrPromise` types from `django-stubs-ext` in type hints. Which solution to choose depends depends on the particular case. See [working with lazy translation objects](https://docs.djangoproject.com/en/4.1/topics/i18n/translation/#working-with-lazy-translation-objects) in the Django documentation for more information.
+If you encounter this error in your own code, you can either cast the `Promise` to `str` (causing the translation to be evaluated), or use the `StrPromise` or `StrOrPromise` types from `django-stubs-ext` in type hints. Which solution to choose depends depends on the particular case. See [working with lazy translation objects](https://docs.djangoproject.com/en/5.2/topics/i18n/translation/#working-with-lazy-translation-objects) in the Django documentation for more information.
 
 If this is reported on Django code, please report an issue or open a pull request to fix the type hints.
 
@@ -329,7 +329,7 @@ error: "type[Model]" has no attribute "objects"  [attr-defined]
 ```
 
 It is a common problem: some `type[models.Model]` types won't have `.objects` available.
-Notable example: [abstract models](https://docs.djangoproject.com/en/5.1/topics/db/models/#abstract-base-classes).
+Notable example: [abstract models](https://docs.djangoproject.com/en/5.2/topics/db/models/#abstract-base-classes).
 See [the reasoning here](https://github.com/typeddjango/django-stubs/issues/1684).
 
 So, instead for the general case you should write:

django-stubs/conf/global_settings.pyi

@@ -3,9 +3,7 @@ from re import Pattern
 
 # This is defined here as a do-nothing function because we can't import
 # django.utils.translation -- that module depends on the settings.
-from typing import Any, Literal, Protocol, type_check_only
-
-from typing_extensions import TypeAlias
+from typing import Any, Literal, Protocol, TypeAlias, type_check_only
 
 _Admins: TypeAlias = list[tuple[str, str]]
 

django-stubs/contrib/admin/options.pyi

@@ -1,6 +1,6 @@
 import enum
 from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
-from typing import Any, ClassVar, Generic, Literal, TypeVar, cast, overload, type_check_only
+from typing import Any, ClassVar, Generic, Literal, TypeAlias, TypeVar, cast, overload, type_check_only
 
 from django import forms
 from django.contrib.admin.filters import FieldListFilter, ListFilter
@@ -33,7 +33,7 @@ from django.urls.resolvers import URLPattern
 from django.utils.datastructures import _ListOrTuple
 from django.utils.functional import _StrOrPromise
 from django.utils.safestring import SafeString
-from typing_extensions import Self, TypeAlias, TypedDict, deprecated
+from typing_extensions import Self, TypedDict, deprecated
 
 IS_POPUP_VAR: str
 TO_FIELD_VAR: str

django-stubs/contrib/admin/sites.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Callable, Iterable
-from typing import Any, TypeVar
+from typing import Any, TypeAlias, TypeVar
 from weakref import WeakSet
 
 from django.apps.config import AppConfig
@@ -14,7 +14,6 @@ from django.http.response import HttpResponse, HttpResponseBase
 from django.template.response import TemplateResponse
 from django.urls import URLPattern, URLResolver
 from django.utils.functional import LazyObject, _StrOrPromise
-from typing_extensions import TypeAlias
 
 all_sites: WeakSet[AdminSite]
 

django-stubs/contrib/auth/backends.pyi

@@ -1,28 +1,37 @@
-from typing import Any, TypeVar
+from typing import Any, TypeAlias, TypeVar
 
 from django.contrib.auth.base_user import AbstractBaseUser, _UserModel
 from django.contrib.auth.models import AnonymousUser, Permission
 from django.db.models import QuerySet
 from django.db.models.base import Model
 from django.http.request import HttpRequest
-from typing_extensions import TypeAlias
 
 UserModel: TypeAlias = type[_UserModel]
 _AnyUser: TypeAlias = _UserModel | AnonymousUser
 
 class BaseBackend:
     def authenticate(self, request: HttpRequest | None, **kwargs: Any) -> _UserModel | None: ...
+    async def aauthenticate(self, request: HttpRequest | None, **kwargs: Any) -> _UserModel | None: ...
     def get_user(self, user_id: Any) -> _UserModel | None: ...
+    async def aget_user(self, user_id: Any) -> _UserModel | None: ...
     def get_user_permissions(self, user_obj: _AnyUser, obj: Model | None = ...) -> set[str]: ...
+    async def aget_user_permissions(self, user_obj: _AnyUser, obj: Model | None = ...) -> set[str]: ...
     def get_group_permissions(self, user_obj: _AnyUser, obj: Model | None = ...) -> set[str]: ...
+    async def aget_group_permissions(self, user_obj: _AnyUser, obj: Model | None = ...) -> set[str]: ...
     def get_all_permissions(self, user_obj: _AnyUser, obj: Model | None = ...) -> set[str]: ...
+    async def aget_all_permissions(self, user_obj: _AnyUser, obj: Model | None = ...) -> set[str]: ...
     def has_perm(self, user_obj: _AnyUser, perm: str, obj: Model | None = ...) -> bool: ...
+    async def ahas_perm(self, user_obj: _AnyUser, perm: str, obj: Model | None = ...) -> bool: ...
 
 class ModelBackend(BaseBackend):
     def authenticate(
         self, request: HttpRequest | None, username: str | None = ..., password: str | None = ..., **kwargs: Any
     ) -> _UserModel | None: ...
+    async def aauthenticate(
+        self, request: HttpRequest | None, username: str | None = ..., password: str | None = ..., **kwargs: Any
+    ) -> _UserModel | None: ...
     def has_module_perms(self, user_obj: _AnyUser, app_label: str) -> bool: ...
+    async def ahas_module_perms(self, user_obj: _AnyUser, app_label: str) -> bool: ...
     def user_can_authenticate(self, user: _AnyUser | None) -> bool: ...
     def with_perm(
         self,

django-stubs/contrib/auth/base_user.pyi

@@ -1,12 +1,11 @@
 from collections.abc import Iterable
 from datetime import date, datetime
-from typing import Any, ClassVar, Literal, TypeVar, overload
+from typing import Any, ClassVar, Literal, TypeAlias, TypeVar, overload
 
 from django.db import models
 from django.db.models.base import Model
 from django.db.models.expressions import Combinable
 from django.db.models.fields import BooleanField
-from typing_extensions import TypeAlias
 
 _T = TypeVar("_T", bound=Model)
 

django-stubs/contrib/auth/forms.pyi

@@ -1,6 +1,6 @@
 from collections.abc import Iterable
 from logging import Logger
-from typing import Any, TypeVar
+from typing import Any, TypeAlias, TypeVar
 
 from django import forms
 from django.contrib.auth.base_user import AbstractBaseUser, _UserModel
@@ -12,7 +12,6 @@ from django.forms.fields import _ClassLevelWidgetT
 from django.forms.widgets import Widget
 from django.http.request import HttpRequest
 from django.utils.functional import _StrOrPromise
-from typing_extensions import TypeAlias
 
 logger: Logger
 

django-stubs/contrib/auth/middleware.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Callable, ClassVar
+from collections.abc import Callable
+from typing import Any, ClassVar
 
 from django.contrib.auth.base_user import _UserModel
 from django.contrib.auth.models import AnonymousUser