Merge branch 'main' into patch-5

Author: kingbuzzman

.github/workflows/deploy.yml

@@ -14,7 +14,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
 
@@ -34,10 +34,10 @@ jobs:
 
     steps:
       - name: Download Package
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: Packages
           path: dist
 
       - name: Publish package
-        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0

.github/workflows/main.yml

@@ -29,11 +29,11 @@ jobs:
     env:
       TOXENV: ${{ matrix.name }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
 

pyproject.toml

@@ -198,36 +198,28 @@ extend-select = [
     "RUF",   # Ruff-specific rules
 ]
 ignore = [
-    "D100", # Missing docstring in public module
-    "D101", # Missing docstring in public class
-    "D102", # Missing docstring in public method
-    "D103", # Missing docstring in public function
-    "D104", # Missing docstring in public package
-    "D105", # Missing docstring in magic method
-    "D107", # Missing docstring in __init__
-    "D200", # One-line docstring should fit on one line
-    "D202", # No blank lines allowed after function docstring
-    "D203", # Class definitions that are not preceded by a blank line
-    "D205", # 1 blank line required between summary line and description
-    "D209", # Multi-line docstring closing quotes should be on a separate line
-    "D212", # Multi-line docstring summary should start at the first line
-    "D213", # Multi-line docstring summary should start at the second line
-    "D400", # First line should end with a period
-    "D401", # First line of docstring should be in imperative mood
-    "D404", # First word of the docstring should not be "This"
-    "D415", # First line should end with a period, question mark, or exclamation point
-    "S101", # Use of `assert` detected
+    "ANN401", # Dynamically typed expressions (typing.Any) are disallowed
+    "D100",   # Missing docstring in public module
+    "D101",   # Missing docstring in public class
+    "D102",   # Missing docstring in public method
+    "D103",   # Missing docstring in public function
+    "D104",   # Missing docstring in public package
+    "D105",   # Missing docstring in magic method
+    "D107",   # Missing docstring in __init__
+    "D200",   # One-line docstring should fit on one line
+    "D202",   # No blank lines allowed after function docstring
+    "D203",   # Class definitions that are not preceded by a blank line
+    "D205",   # 1 blank line required between summary line and description
+    "D209",   # Multi-line docstring closing quotes should be on a separate line
+    "D212",   # Multi-line docstring summary should start at the first line
+    "D213",   # Multi-line docstring summary should start at the second line
+    "D400",   # First line should end with a period
+    "D401",   # First line of docstring should be in imperative mood
+    "D404",   # First word of the docstring should not be "This"
+    "D415",   # First line should end with a period, question mark, or exclamation point
+    "S101",   # Use of `assert` detected
 
     # TODO - need to fix these
-    "ANN001",  # Missing type annotation for function argument
-    "ANN002",  # Missing type annotation for public function
-    "ANN003",  # Missing type annotation for public method
-    "ANN201",  # Missing return type annotation for public function
-    "ANN202",  # Missing return type annotation for private function
-    "ANN204",  # Missing return type annotation for special method
-    "ANN401",  # Dynamically typed expressions .. are disallowed
-    "ARG001",  # Unused function argument
-    "ARG002",  # Unused method argument
     "C901",    # .. is too complex
     "COM812",  # Trailing comma missing
     "E501",    # Line too long

pytest_django/asserts.py

@@ -27,7 +27,7 @@ class MessagesTestCase(MessagesTestMixin, TestCase):
     test_case = TestCase("run")
 
 
-def _wrapper(name: str):
+def _wrapper(name: str) -> Callable[..., Any]:
     func = getattr(test_case, name)
 
     @wraps(func)
@@ -66,7 +66,12 @@ def assertion_func(*args, **kwargs):
 
 
 if TYPE_CHECKING:
+    from collections.abc import Collection, Iterator, Sequence
+    from contextlib import AbstractContextManager
+    from typing import overload
+
     from django import forms
+    from django.db.models import Model, QuerySet, RawQuerySet
     from django.http.response import HttpResponseBase
 
     def assertRedirects(
@@ -121,34 +126,34 @@ def assertTemplateUsed(
         template_name: str | None = ...,
         msg_prefix: str = ...,
         count: int | None = ...,
-    ): ...
+    ) -> None: ...
 
     def assertTemplateNotUsed(
         response: HttpResponseBase | str | None = ...,
         template_name: str | None = ...,
         msg_prefix: str = ...,
-    ): ...
+    ) -> None: ...
 
     def assertRaisesMessage(
         expected_exception: type[Exception],
         expected_message: str,
-        *args,
-        **kwargs,
-    ): ...
+        *args: Any,
+        **kwargs: Any,
+    ) -> None: ...
 
     def assertWarnsMessage(
         expected_warning: Warning,
         expected_message: str,
-        *args,
-        **kwargs,
-    ): ...
+        *args: Any,
+        **kwargs: Any,
+    ) -> None: ...
 
     def assertFieldOutput(
-        fieldclass,
-        valid,
-        invalid,
-        field_args=...,
-        field_kwargs=...,
+        fieldclass: type[forms.Field],
+        valid: Any,
+        invalid: Any,
+        field_args: Any = ...,
+        field_kwargs: Any = ...,
         empty_value: str = ...,
     ) -> None: ...
 
@@ -204,34 +209,44 @@ def assertXMLNotEqual(
 
     # Removed in Django 5.1: use assertQuerySetEqual.
     def assertQuerysetEqual(
-        qs,
-        values,
-        transform=...,
+        qs: Iterator[Any] | list[Model] | QuerySet | RawQuerySet,
+        values: Collection[Any],
+        transform: Callable[[Model], Any] | type[str] | None = ...,
         ordered: bool = ...,
         msg: str | None = ...,
     ) -> None: ...
 
     def assertQuerySetEqual(
-        qs,
-        values,
-        transform=...,
+        qs: Iterator[Any] | list[Model] | QuerySet | RawQuerySet,
+        values: Collection[Any],
+        transform: Callable[[Model], Any] | type[str] | None = ...,
         ordered: bool = ...,
         msg: str | None = ...,
     ) -> None: ...
 
+    @overload
+    def assertNumQueries(
+        num: int, func: None = None, *, using: str = ...
+    ) -> AbstractContextManager[None]: ...
+
+    @overload
+    def assertNumQueries(
+        num: int, func: Callable[..., Any], *args: Any, using: str = ..., **kwargs: Any
+    ) -> None: ...
+
     def assertNumQueries(
         num: int,
         func=...,
-        *args,
+        *args: Any,
         using: str = ...,
-        **kwargs,
+        **kwargs: Any,
     ): ...
 
     # Added in Django 5.0.
     def assertMessages(
         response: HttpResponseBase,
         expected_messages: Sequence[Message],
-        *args,
+        *args: Any,
         ordered: bool = ...,
     ) -> None: ...
 

pytest_django/django_compat.py

@@ -2,9 +2,23 @@
 # this is the case before you call them.
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 import pytest
 
 
+if TYPE_CHECKING:
+    from typing import TypeAlias
+
+    from django.contrib.auth.models import AbstractBaseUser
+
+    _User: TypeAlias = AbstractBaseUser
+
+    _UserModel: TypeAlias = type[_User]
+
+    __all__ = ("_User", "_UserModel")
+
+
 def is_django_unittest(request_or_item: pytest.FixtureRequest | pytest.Item) -> bool:
     """Returns whether the request or item is a Django test case."""
     from django.test import SimpleTestCase

pytest_django/fixtures.py

@@ -6,7 +6,7 @@
 from collections.abc import Generator, Iterable, Sequence
 from contextlib import AbstractContextManager, contextmanager
 from functools import partial
-from typing import TYPE_CHECKING, Any, Callable, Literal, Optional, Protocol, Union
+from typing import TYPE_CHECKING, Protocol
 
 import pytest
 
@@ -16,16 +16,18 @@
 
 
 if TYPE_CHECKING:
+    from typing import Any, Callable, Literal, Optional, Union
+
     import django
     import django.test
 
     from . import DjangoDbBlocker
+    from .django_compat import _User, _UserModel
 
-
-_DjangoDbDatabases = Optional[Union[Literal["__all__"], Iterable[str]]]
-_DjangoDbAvailableApps = Optional[list[str]]
-# transaction, reset_sequences, databases, serialized_rollback, available_apps
-_DjangoDb = tuple[bool, bool, _DjangoDbDatabases, bool, _DjangoDbAvailableApps]
+    _DjangoDbDatabases = Optional[Union[Literal["__all__"], Iterable[str]]]
+    _DjangoDbAvailableApps = Optional[list[str]]
+    # transaction, reset_sequences, databases, serialized_rollback, available_apps
+    _DjangoDb = tuple[bool, bool, _DjangoDbDatabases, bool, _DjangoDbAvailableApps]
 
 
 __all__ = [
@@ -75,15 +77,15 @@ def django_db_modify_db_settings_xdist_suffix(request: pytest.FixtureRequest) ->
 
 @pytest.fixture(scope="session")
 def django_db_modify_db_settings_parallel_suffix(
-    django_db_modify_db_settings_tox_suffix: None,
-    django_db_modify_db_settings_xdist_suffix: None,
+    django_db_modify_db_settings_tox_suffix: None,  # noqa: ARG001
+    django_db_modify_db_settings_xdist_suffix: None,  # noqa: ARG001
 ) -> None:
     skip_if_no_django()
 
 
 @pytest.fixture(scope="session")
 def django_db_modify_db_settings(
-    django_db_modify_db_settings_parallel_suffix: None,
+    django_db_modify_db_settings_parallel_suffix: None,  # noqa: ARG001
 ) -> None:
     """Modify db settings just before the databases are configured."""
     skip_if_no_django()
@@ -162,12 +164,12 @@ def _get_databases_for_setup(
 @pytest.fixture(scope="session")
 def django_db_setup(
     request: pytest.FixtureRequest,
-    django_test_environment: None,
+    django_test_environment: None,  # noqa: ARG001
     django_db_blocker: DjangoDbBlocker,
     django_db_use_migrations: bool,
     django_db_keepdb: bool,
     django_db_createdb: bool,
-    django_db_modify_db_settings: None,
+    django_db_modify_db_settings: None,  # noqa: ARG001
 ) -> Generator[None, None, None]:
     """Top level fixture to ensure test databases are available"""
     from django.test.utils import setup_databases, teardown_databases
@@ -350,7 +352,7 @@ def __getitem__(self, item: str) -> None:
     settings.MIGRATION_MODULES = DisableMigrations()
 
     class MigrateSilentCommand(migrate.Command):
-        def handle(self, *args, **kwargs):
+        def handle(self, *args: Any, **kwargs: Any) -> Any:
             kwargs["verbosity"] = 0
             return super().handle(*args, **kwargs)
 
@@ -474,26 +476,26 @@ def async_client() -> django.test.AsyncClient:
 
 
 @pytest.fixture
-def django_user_model(db: None):
+def django_user_model(db: None) -> _UserModel:  # noqa: ARG001
     """The class of Django's user model."""
     from django.contrib.auth import get_user_model
 
-    return get_user_model()
+    return get_user_model()  # type: ignore[no-any-return]
 
 
 @pytest.fixture
-def django_username_field(django_user_model) -> str:
+def django_username_field(django_user_model: _UserModel) -> str:
     """The fieldname for the username used with Django's user model."""
     field: str = django_user_model.USERNAME_FIELD
     return field
 
 
 @pytest.fixture
 def admin_user(
-    db: None,
-    django_user_model,
+    db: None,  # noqa: ARG001
+    django_user_model: _User,
     django_username_field: str,
-):
+) -> _User:
     """A Django admin user.
 
     This uses an existing user with username "admin", or creates a new one with
@@ -521,8 +523,8 @@ def admin_user(
 
 @pytest.fixture
 def admin_client(
-    db: None,
-    admin_user,
+    db: None,  # noqa: ARG001
+    admin_user: _User,
 ) -> django.test.Client:
     """A Django test client logged in as an admin user."""
     from django.test import Client
@@ -568,14 +570,14 @@ def __delattr__(self, attr: str) -> None:
 
         self._to_restore.append(override)
 
-    def __setattr__(self, attr: str, value) -> None:
+    def __setattr__(self, attr: str, value: Any) -> None:
         from django.test import override_settings
 
         override = override_settings(**{attr: value})
         override.enable()
         self._to_restore.append(override)
 
-    def __getattr__(self, attr: str):
+    def __getattr__(self, attr: str) -> Any:
         from django.conf import settings
 
         return getattr(settings, attr)
@@ -588,7 +590,7 @@ def finalize(self) -> None:
 
 
 @pytest.fixture
-def settings():
+def settings() -> Generator[SettingsWrapper, None, None]:
     """A Django settings object which restores changes after the testrun"""
     skip_if_no_django()
 
@@ -598,7 +600,9 @@ def settings():
 
 
 @pytest.fixture(scope="session")
-def live_server(request: pytest.FixtureRequest):
+def live_server(
+    request: pytest.FixtureRequest,
+) -> Generator[live_server_helper.LiveServer, None, None]:
     """Run a live Django server in the background during tests
 
     The address the server is started from is taken from the