Prepare for 5.2.9 release (without Django 6.0 changes) (#2995)

* Revert "Remove useless decorators from `main/django/contrib/auth/admin.py` (#2986)"

This reverts commit 6915b64.

* Revert "Add `SetPasswordMixin.__class_getitem__` (#2985)"

This reverts commit f788f6c.

* Revert "Django 6.0.1 (#2984)"

This reverts commit 46c1675

* Revert "Django 6.0: Add Django Tasks framework (#2967)"

This reverts commit b962b71.

* Revert "Django 6.0: require kwargs for optional parameters in EmailMessage (#2975)"

This reverts commit 4e2deb1.

* Revert "Fix missing `__del__` (#2974)"

This reverts commit a936349

* Revert "Add hints support to postgres extension classes (#2972)"

This reverts commit cc934a7.

* Revert "Django 6.0: require kwargs for optional parameters in mail functions (#2966)"

This reverts commit f1f9653.

* Revert "Add stubs for django.contrib.postgres.search.Lexeme (#2961)"

This reverts commit fea872d.

* Revert "Add stubs for django.db.models.StringAgg and Aggregate order_by fields (#2960)"

This reverts commit 22ef63a.

* Revert "Django 6.0: Add `databases=` parameter to `check_generic_foreign_keys`, `check_model_name_lengths` (#2951)"

This reverts commit a579836

* Revert "Django 6.0: Add stubs for built-in CSP support (#2931)"

This reverts commit 51beeee.

* Revert "Django 6.0: Add Model.NotUpdated & ObjectNotUpdated exceptions (#2940)"

This reverts commit b38eaf4.

* Revert "Tests: Update to Django 6.0; fall back to 5.2 on Python <3.12 (#2939)"

This reverts commit 5adea71

* Revert "Django 6.0: update ADMINS and MANAGERS setting type (#2965)"

This reverts commit 833d035.

Author: intgr

.github/workflows/test.yml

@@ -205,11 +205,6 @@ jobs:
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13']
         django-version: ['5.0', '5.1', '5.2']
-        include:
-          - python-version: '3.12'
-            django-version: '6.0'
-          - python-version: '3.13'
-            django-version: '6.0'
     steps:
       - uses: actions/checkout@v6
       - name: Setup system dependencies

.gitignore

@@ -6,7 +6,6 @@
 .pytest_cache/
 .ruff_cache/
 .venv/
-venv/
 __pycache__/
 django-source/
 out/

django-stubs/conf/global_settings.pyi

@@ -1,4 +1,4 @@
-from collections.abc import Collection, Mapping, Sequence
+from collections.abc import Sequence
 from re import Pattern
 
 # This is defined here as a do-nothing function because we can't import
@@ -10,9 +10,7 @@ from typing_extensions import NotRequired
 
 from django_stubs_ext.settings import TemplatesSetting
 
-# Note: the tuple element format for ADMINS or MANAGERS is deprecated. Use a
-# list of strings instead.
-_Admins: TypeAlias = list[str] | list[tuple[str, str]]
+_Admins: TypeAlias = list[tuple[str, str]]
 
 ####################
 # CORE             #
@@ -543,9 +541,3 @@ SECURE_REDIRECT_EXEMPT: list[str]
 SECURE_REFERRER_POLICY: str
 SECURE_SSL_HOST: str | None
 SECURE_SSL_REDIRECT: bool
-
-##################
-# CSP MIDDLEWARE #
-##################
-SECURE_CSP: Mapping[str, Collection[str] | str]
-SECURE_CSP_REPORT_ONLY: Mapping[str, Collection[str] | str]

django-stubs/contrib/auth/admin.pyi

@@ -7,6 +7,9 @@ from django.http.response import HttpResponse
 
 _AbstractUserT = TypeVar("_AbstractUserT", bound=AbstractUser)
 
+csrf_protect_m: Any
+sensitive_post_parameters_m: Any
+
 class GroupAdmin(admin.ModelAdmin[Group]): ...
 
 class UserAdmin(admin.ModelAdmin[_AbstractUserT]):

django-stubs/contrib/auth/forms.pyi

@@ -45,7 +45,6 @@ class SetPasswordMixin(Generic[_UserType]):
     def set_password_and_save(
         self, user: _UserType, password_field_name: str = "password1", commit: bool = True
     ) -> _UserType: ...
-    def __class_getitem__(cls, *args: Any, **kwargs: Any) -> Any: ...
 
 class SetUnusablePasswordMixin(Generic[_UserType]):
     usable_password_help_text: _StrOrPromise

django-stubs/contrib/contenttypes/checks.pyi

@@ -4,9 +4,5 @@ from typing import Any
 from django.apps.config import AppConfig
 from django.core.checks.messages import CheckMessage
 
-def check_generic_foreign_keys(
-    app_configs: Sequence[AppConfig] | None, *, databases: Sequence[str] | None = ..., **kwargs: Any
-) -> list[CheckMessage]: ...
-def check_model_name_lengths(
-    app_configs: Sequence[AppConfig] | None, *, databases: Sequence[str] | None = ..., **kwargs: Any
-) -> list[CheckMessage]: ...
+def check_generic_foreign_keys(app_configs: Sequence[AppConfig] | None = None, **kwargs: Any) -> list[CheckMessage]: ...
+def check_model_name_lengths(app_configs: Sequence[AppConfig] | None = None, **kwargs: Any) -> list[CheckMessage]: ...

django-stubs/contrib/postgres/operations.pyi

@@ -1,38 +1,35 @@
-from typing import Any
-
 from django.db.backends.base.schema import BaseDatabaseSchemaEditor
 from django.db.migrations import AddConstraint, AddIndex, RemoveIndex
 from django.db.migrations.operations.base import Operation
 
 class CreateExtension(Operation):
     name: str
-    hints: dict[str, Any]
-    def __init__(self, name: str, hints: dict[str, Any] | None = None) -> None: ...
+    def __init__(self, name: str) -> None: ...
     def extension_exists(self, schema_editor: BaseDatabaseSchemaEditor, extension: str) -> bool: ...
 
 class BloomExtension(CreateExtension):
-    def __init__(self, hints: dict[str, Any] | None = None) -> None: ...
+    def __init__(self) -> None: ...
 
 class BtreeGinExtension(CreateExtension):
-    def __init__(self, hints: dict[str, Any] | None = None) -> None: ...
+    def __init__(self) -> None: ...
 
 class BtreeGistExtension(CreateExtension):
-    def __init__(self, hints: dict[str, Any] | None = None) -> None: ...
+    def __init__(self) -> None: ...
 
 class CITextExtension(CreateExtension):
-    def __init__(self, hints: dict[str, Any] | None = None) -> None: ...
+    def __init__(self) -> None: ...
 
 class CryptoExtension(CreateExtension):
-    def __init__(self, hints: dict[str, Any] | None = None) -> None: ...
+    def __init__(self) -> None: ...
 
 class HStoreExtension(CreateExtension):
-    def __init__(self, hints: dict[str, Any] | None = None) -> None: ...
+    def __init__(self) -> None: ...
 
 class TrigramExtension(CreateExtension):
-    def __init__(self, hints: dict[str, Any] | None = None) -> None: ...
+    def __init__(self) -> None: ...
 
 class UnaccentExtension(CreateExtension):
-    def __init__(self, hints: dict[str, Any] | None = None) -> None: ...
+    def __init__(self) -> None: ...
 
 class NotInTransactionMixin:
     def _ensure_not_in_transaction(self, schema_editor: BaseDatabaseSchemaEditor) -> None: ...

django-stubs/contrib/postgres/search.pyi

@@ -2,7 +2,7 @@ from typing import Any, ClassVar, TypeAlias
 
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.models import Expression, Field, FloatField, TextField
-from django.db.models.expressions import Combinable, CombinedExpression, Func, Value
+from django.db.models.expressions import Combinable, CombinedExpression, Func
 from django.db.models.lookups import Lookup
 from django.db.models.sql.compiler import SQLCompiler, _AsSqlType
 from typing_extensions import Self
@@ -142,16 +142,3 @@ class TrigramWordDistance(TrigramWordBase): ...
 class TrigramStrictWordDistance(TrigramWordBase): ...
 class TrigramWordSimilarity(TrigramWordBase): ...
 class TrigramStrictWordSimilarity(TrigramWordBase): ...
-
-class Lexeme(Value):
-    def __init__(
-        self,
-        value: Any,
-        output_field: Any | None = None,
-        *,
-        invert: bool = False,
-        prefix: bool = False,
-        weight: Any | None = None,
-    ) -> None: ...
-
-class CombinedLexeme(CombinedExpression): ...

django-stubs/core/exceptions.pyi

@@ -9,7 +9,6 @@ class AppRegistryNotReady(Exception): ...
 class ObjectDoesNotExist(Exception):
     silent_variable_failure: bool
 
-class ObjectNotUpdated(Exception): ...
 class MultipleObjectsReturned(Exception): ...
 class SuspiciousOperation(Exception): ...
 class SuspiciousMultipartForm(SuspiciousOperation): ...

django-stubs/core/mail/__init__.pyi

@@ -16,13 +16,12 @@ from .message import make_msgid as make_msgid
 from .utils import DNS_NAME as DNS_NAME
 from .utils import CachedDnsName as CachedDnsName
 
-def get_connection(backend: str | None = None, *, fail_silently: bool = False, **kwds: Any) -> Any: ...
+def get_connection(backend: str | None = None, fail_silently: bool = False, **kwds: Any) -> Any: ...
 def send_mail(
     subject: _StrOrPromise,
     message: _StrOrPromise,
     from_email: str | None,
     recipient_list: Sequence[str],
-    *,
     fail_silently: bool = False,
     auth_user: str | None = None,
     auth_password: str | None = None,
@@ -31,7 +30,6 @@ def send_mail(
 ) -> int: ...
 def send_mass_mail(
     datatuple: Iterable[tuple[str, str, str | None, list[str]]],
-    *,
     fail_silently: bool = False,
     auth_user: str | None = None,
     auth_password: str | None = None,
@@ -40,15 +38,13 @@ def send_mass_mail(
 def mail_admins(
     subject: _StrOrPromise,
     message: _StrOrPromise,
-    *,
     fail_silently: bool = False,
     connection: Any | None = None,
     html_message: str | None = None,
 ) -> None: ...
 def mail_managers(
     subject: _StrOrPromise,
     message: _StrOrPromise,
-    *,
     fail_silently: bool = False,
     connection: Any | None = None,
     html_message: str | None = None,