diff --git a/django-stubs/contrib/auth/forms.pyi b/django-stubs/contrib/auth/forms.pyi index b5e4d31a0..37aea5444 100644 --- a/django-stubs/contrib/auth/forms.pyi +++ b/django-stubs/contrib/auth/forms.pyi @@ -1,4 +1,5 @@ from collections.abc import Iterable +from logging import Logger from typing import Any, TypeVar from django import forms @@ -12,6 +13,8 @@ from django.forms.widgets import Widget from django.http.request import HttpRequest from typing_extensions import TypeAlias +logger: Logger + UserModel: TypeAlias = type[_UserModel] _User = TypeVar("_User", bound=AbstractBaseUser) diff --git a/django-stubs/db/models/expressions.pyi b/django-stubs/db/models/expressions.pyi index f76d9ce9f..0bbfb3e5b 100644 --- a/django-stubs/db/models/expressions.pyi +++ b/django-stubs/db/models/expressions.pyi @@ -223,7 +223,9 @@ class Ref(Expression): def __init__(self, refs: str, source: Expression) -> None: ... class ExpressionList(Func): - def __init__(self, *expressions: BaseExpression | Combinable, **extra: Any) -> None: ... + def __init__( + self, *expressions: BaseExpression | Combinable, output_field: Field | None = None, **extra: Any + ) -> None: ... class OrderByList(Func): ... diff --git a/requirements.txt b/requirements.txt index d675e168a..80e4e9a48 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ pytest-shard==0.1.2 # Django deps: psycopg2-binary Django==4.2.13; python_version < '3.10' -Django==5.1; python_version >= '3.10' +Django==5.1.1; python_version >= '3.10' -e ./ext -e .[redis,compatible-mypy,oracle] diff --git a/scripts/stubtest/allowlist_todo_django51.txt b/scripts/stubtest/allowlist_todo_django51.txt index 5d78f3038..1ed12e7c3 100644 --- a/scripts/stubtest/allowlist_todo_django51.txt +++ b/scripts/stubtest/allowlist_todo_django51.txt @@ -17,6 +17,8 @@ django.contrib.auth.forms.AdminPasswordChangeForm.usable_password_help_text django.contrib.auth.forms.BaseUserCreationForm.clean_password2 django.contrib.auth.forms.SetPasswordForm.clean_new_password2 django.contrib.auth.forms.SetPasswordMixin +django.contrib.auth.forms.SetUnusablePasswordMixin +django.contrib.auth.forms.AdminUserCreationForm django.contrib.auth.hashers.SHA1PasswordHasher django.contrib.auth.hashers.UnsaltedMD5PasswordHasher django.contrib.auth.hashers.UnsaltedSHA1PasswordHasher @@ -133,8 +135,6 @@ django.db.backends.oracle.features.DatabaseFeatures.supports_comparing_boolean_e django.db.backends.oracle.features.DatabaseFeatures.supports_frame_exclusion django.db.backends.postgresql.base.DatabaseWrapper.close_pool django.db.backends.postgresql.base.DatabaseWrapper.pool -django.db.backends.postgresql.base.ensure_role -django.db.backends.postgresql.base.ensure_timezone django.db.backends.postgresql.features.DatabaseFeatures.django_test_skips django.db.backends.postgresql.features.DatabaseFeatures.is_postgresql_16 django.db.backends.postgresql.features.DatabaseFeatures.supports_frame_exclusion