Merge branch 'main' into patch-5

Author: kingbuzzman

.github/workflows/deploy.yml

@@ -14,12 +14,12 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: Build and Check Package
-        uses: hynek/build-and-inspect-python-package@c52c3a4710070b50470d903818a7b25115dcd076  # v2.13.0
+        uses: hynek/build-and-inspect-python-package@efb823f52190ad02594531168b7a2d5790e66516  # v2.14.0
 
   deploy:
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && github.repository == 'pytest-dev/pytest-django'
@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Download Package
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: Packages
           path: dist

.github/workflows/main.yml

@@ -29,7 +29,7 @@ jobs:
     env:
       TOXENV: ${{ matrix.name }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -86,6 +86,18 @@ jobs:
           python: '3.13'
           allow_failure: false
 
+        - name: py314-djmain-postgres-xdist-coverage
+          python: '3.14'
+          allow_failure: true
+
+        - name: py314-dj60-postgres-xdist-coverage
+          python: '3.14'
+          allow_failure: false
+
+        - name: py314-dj52-postgres-xdist-coverage
+          python: '3.14'
+          allow_failure: false
+
         - name: py313-dj52-postgres-xdist-coverage
           python: '3.13'
           allow_failure: false
@@ -94,12 +106,12 @@ jobs:
           python: '3.13'
           allow_failure: false
 
-        - name: py312-dj42-postgres-xdist-coverage
+        - name: py312-dj60-postgres-xdist-coverage
           python: '3.12'
           allow_failure: false
 
-        - name: py311-dj50-postgres-xdist-coverage
-          python: '3.11'
+        - name: py312-dj42-postgres-xdist-coverage
+          python: '3.12'
           allow_failure: false
 
         - name: py311-dj42-postgres-xdist-coverage
@@ -126,17 +138,17 @@ jobs:
           python: '3.10'
           allow_failure: false
 
-        - name: py39-dj42-mysql-xdist-coverage
-          python: '3.9'
-          allow_failure: false
-
         - name: py313-djmain-sqlite-coverage
           python: '3.13'
           allow_failure: true
 
+        - name: py313-dj60-sqlite-coverage
+          python: '3.13'
+          allow_failure: false
+
         - name: py313-dj52-sqlite-coverage
           python: '3.13'
-          allow_failure: true
+          allow_failure: false
 
         - name: py312-dj51-sqlite-xdist-coverage
           python: '3.12'
@@ -148,7 +160,7 @@ jobs:
 
         # pypy3: not included with coverage reports (much slower then).
         - name: pypy3-dj42-postgres
-          python: 'pypy3.9'
+          python: 'pypy3.10'
           allow_failure: false
 
   check:  # This job does nothing and is only used for the branch protection

README.rst

@@ -32,9 +32,9 @@ pytest-django allows you to test your Django project/applications with the
   <https://pytest-django.readthedocs.io/en/latest/contributing.html>`_
 * Version compatibility:
 
-  * Django: 4.2, 5.1, 5.2 and latest main branch (compatible at the time
+  * Django: 4.2, 5.1, 5.2, 6.0 and latest main branch (compatible at the time
     of each release)
-  * Python: CPython>=3.9 or PyPy 3
+  * Python: CPython>=3.10 or PyPy 3
   * pytest: >=7.0
 
   For compatibility with older versions, use previous pytest-django releases.

docs/changelog.rst

@@ -1,13 +1,23 @@
 Changelog
 =========
 
-v4.12.0 (Not released yet)
---------------------------
+v4.12.0 (2026-02-14)
+--------------------
+
+Compatibility
+^^^^^^^^^^^^^
+
+* Official Python 3.14 support.
+* Dropped support for Python 3.9, minimum version is now Python 3.10.
+* Official Django 6.0 support.
 
 Improvements
 ^^^^^^^^^^^^
 
 * The :ref:`multiple databases <multi-db>` support added in v4.3.0 is no longer considered experimental.
+* Added :func:`@pytest.mark.django_isolate_apps <pytest.mark.django_isolate_apps>`
+  for isolating Django's app registry in pytest tests, and a
+  :fixture:`django_isolated_apps` fixture to access the isolated Apps registry instance if needed.
 
 v4.11.1 (2025-04-03)
 --------------------

docs/helpers.rst

@@ -128,6 +128,29 @@ dynamically in a hook or fixture.
          assert b'Success!' in client.get('/some_url_defined_in_test_urls/').content
 
 
+``pytest.mark.django_isolate_apps`` - isolate the app registry
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. decorator:: pytest.mark.django_isolate_apps(*app_labels)
+
+   Isolate models defined within the marked tests into their own isolated apps registry.
+   See :func:`Isolating apps <django.test.utils.isolate_apps>` for when this might be useful.
+
+   :type app_labels: str
+   :param app_labels:
+     One or more application labels to include in the isolated registry.
+
+   The :fixture:`django_isolated_apps` fixture provides access to the isolated
+   apps registry instance, if needed.
+
+   Example usage::
+
+     @pytest.mark.django_isolate_apps("myapp")
+     def test_something(django_isolated_apps):
+         assert django_isolated_apps.is_installed("myapp")
+         assert not django_isolated_apps.is_installed("otherapp")
+
+
 ``pytest.mark.ignore_template_errors`` - ignore invalid template variables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -334,6 +357,14 @@ resolves to the user model's :attr:`~django.contrib.auth.models.CustomUser.USERN
 Use this fixture to make pluggable apps testable regardless what the username field
 is configured to be in the containing Django project.
 
+.. fixture:: django_isolated_apps
+
+``django_isolated_apps`` - isolated app registry
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Access the isolated app registry created by
+:func:`@pytest.mark.django_isolate_apps([...]) <pytest.mark.django_isolate_apps>`.
+
 .. fixture:: db
 
 ``db``

docs/index.rst

@@ -33,6 +33,18 @@ Example using pytest.ini or tox.ini
 Example using pyproject.toml
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+For pytest 9.0 and later, use the native TOML format:
+
+.. code-block:: toml
+
+   # -- Example FILE: pyproject.toml
+   [tool.pytest]
+   DJANGO_SETTINGS_MODULE = "test.settings"
+   # -- recommended but optional:
+   python_files = ["test_*.py", "*_test.py", "testing/python/*.py"]
+
+For pytest 7.x and 8.x, use the INI-compatible format:
+
 .. code-block:: toml
 
    # -- Example FILE: pyproject.toml

pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
 name = "pytest-django"
 description = "A Django plugin for pytest."
 readme = "README.rst"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dynamic = ["version"]
 authors = [
     { name = "Andreas Pelme", email = "andreas@pelme.se" },
@@ -24,15 +24,16 @@ classifiers = [
     "Framework :: Django :: 4.2",
     "Framework :: Django :: 5.1",
     "Framework :: Django :: 5.2",
+    "Framework :: Django :: 6.0",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Topic :: Software Development :: Testing",
@@ -48,6 +49,7 @@ docs = [
 testing = [
     "Django",
     "django-configurations>=2.0",
+    "pytest>=9",
 ]
 coverage = [
     "coverage[toml]",
@@ -83,13 +85,12 @@ pytest_django = ["py.typed"]
 [tool.setuptools_scm]
 write_to = "pytest_django/_version.py"
 
-[tool.pytest.ini_options]
+[tool.pytest]
 addopts = [
-    # Error on using unregistered marker.
-    "--strict-markers",
     # Show extra test summary info for everything.
     "-ra",
 ]
+strict = true
 pythonpath = ["."]
 DJANGO_SETTINGS_MODULE = "pytest_django_test.settings_sqlite_file"
 testpaths = ["tests"]

pytest_django/asserts.py

@@ -6,7 +6,7 @@
 
 import warnings
 from functools import wraps
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING
 
 from django import VERSION
 from django.test import LiveServerTestCase, SimpleTestCase, TestCase, TransactionTestCase
@@ -25,6 +25,15 @@ class MessagesTestCase(MessagesTestMixin, TestCase):
 else:
     test_case = TestCase("run")
 
+if TYPE_CHECKING:
+    from collections.abc import Callable, Collection, Iterator, Sequence
+    from contextlib import AbstractContextManager
+    from typing import Any, overload
+
+    from django import forms
+    from django.db.models import Model, QuerySet, RawQuerySet
+    from django.http.response import HttpResponseBase
+
 
 def _wrapper(name: str) -> Callable[..., Any]:
     func = getattr(test_case, name)
@@ -65,13 +74,6 @@ def assertion_func(*args: Any, **kwargs: Any) -> Any:
 
 
 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(
         response: HttpResponseBase,

pytest_django/fixtures.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from collections.abc import Generator, Iterable, Sequence
+from collections.abc import Callable, Generator, Iterable, Sequence
 from contextlib import AbstractContextManager, contextmanager
 from functools import partial
 from typing import TYPE_CHECKING, Protocol
@@ -16,16 +16,16 @@
 
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Literal, Optional, Union
+    from typing import Any, Literal
 
     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]]
+    _DjangoDbDatabases = Literal["__all__"] | Iterable[str] | None
+    _DjangoDbAvailableApps = list[str] | None
     # transaction, reset_sequences, databases, serialized_rollback, available_apps
     _DjangoDb = tuple[bool, bool, _DjangoDbDatabases, bool, _DjangoDbAvailableApps]