Merge branch 'main' into patch-3

Author: kingbuzzman

.github/workflows/deploy.yml

@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
 
       - name: Build and Check Package
-        uses: hynek/build-and-inspect-python-package@b5076c307dc91924a82ad150cdd1533b444d3310  # v2.12.0
+        uses: hynek/build-and-inspect-python-package@c52c3a4710070b50470d903818a7b25115dcd076  # v2.13.0
 
   deploy:
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && github.repository == 'pytest-dev/pytest-django'

.github/workflows/main.yml

@@ -4,12 +4,12 @@ on:
   push:
     branches:
       - main
+    tags:
+      - "*"
   pull_request:
-    branches:
-      - main
 
 concurrency:
-  group: ci-main-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 env:
@@ -25,6 +25,9 @@ jobs:
     timeout-minutes: 15
     permissions:
       contents: read
+      security-events: write
+    env:
+      TOXENV: ${{ matrix.name }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -50,10 +53,17 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.11.1
+          pip install tox==4.26.0
 
       - name: Run tox
-        run: tox -e ${{ matrix.name }}
+        run: tox
+
+      - name: Upload zizmor SARIF report into the GitHub repo code scanning
+        if: contains(matrix.name, 'linting')
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: zizmor.sarif
+          category: zizmor
 
       - name: Report coverage
         if: contains(matrix.name, 'coverage')
@@ -71,6 +81,11 @@ jobs:
           python: '3.13'
           allow_failure: false
 
+        # Explicitly test min pytest.
+        - name: py313-dj52-sqlite-pytestmin-coverage
+          python: '3.13'
+          allow_failure: false
+
         - name: py313-dj52-postgres-xdist-coverage
           python: '3.13'
           allow_failure: false
@@ -131,15 +146,6 @@ jobs:
           python: '3.11'
           allow_failure: false
 
-        - name: py38-dj42-sqlite-xdist-coverage
-          python: '3.8'
-          allow_failure: false
-
-        # Explicitly test min pytest.
-        - name: py38-dj42-sqlite-pytestmin-coverage
-          python: '3.8'
-          allow_failure: false
-
         # pypy3: not included with coverage reports (much slower then).
         - name: pypy3-dj42-postgres
           python: 'pypy3.9'

.github/zizmor.yml

@@ -0,0 +1,7 @@
+rules:
+  unpinned-uses:
+    config:
+      policies:
+        actions/*: ref-pin
+        codecov/codecov-action: ref-pin
+        github/*: ref-pin

.gitignore

@@ -18,3 +18,4 @@ _build
 *.egg
 # autogenerated by setuptools-scm
 /pytest_django/_version.py
+zizmor.sarif

Makefile

@@ -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.0, 5.1, 5.2 and latest main branch (compatible at the time
+  * Django: 4.2, 5.1, 5.2 and latest main branch (compatible at the time
     of each release)
-  * Python: CPython>=3.8 or PyPy 3
+  * Python: CPython>=3.9 or PyPy 3
   * pytest: >=7.0
 
   For compatibility with older versions, use previous pytest-django releases.

README.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+v4.12.0 (Not released yet)
+--------------------------
+
+Improvements
+^^^^^^^^^^^^
+
+* The :ref:`multiple databases <multi-db>` support added in v4.3.0 is no longer considered experimental.
+
 v4.11.1 (2025-04-03)
 --------------------
 

docs/changelog.rst

@@ -140,10 +140,10 @@ writing), running them all will take a long time. All valid configurations can
 be found in `tox.ini`. To test against a few of them, invoke tox with the `-e`
 flag::
 
-    $ tox -e py38-dj32-postgres,py310-dj41-mysql
+    $ tox -e py39-dj42-postgres,py310-dj52-mysql
 
-This will run the tests on Python 3.8/Django 3.2/PostgeSQL and Python
-3.10/Django 4.1/MySQL.
+This will run the tests on Python 3.9/Django 4.2/PostgeSQL and Python
+3.10/Django 5.2/MySQL.
 
 
 Measuring test coverage

docs/contributing.rst

@@ -37,8 +37,8 @@ documentation <pytest:scoped-marking>` for detail::
            assert me.is_superuser
 
 
-By default ``pytest-django`` will set up the Django databases the
-first time a test needs them.  Once setup, the database is cached to be
+By default ``pytest-django`` will set up Django databases the
+first time a test needs them.  Once setup, a database is cached to be
 used for all subsequent tests and rolls back transactions, to isolate
 tests from each other.  This is the same way the standard Django
 :class:`~django.test.TestCase` uses the database.  However
@@ -67,22 +67,16 @@ Tests requiring multiple databases
 
 .. versionadded:: 4.3
 
-.. caution::
-
-    This support is **experimental** and is subject to change without
-    deprecation. We are still figuring out the best way to expose this
-    functionality. If you are using this successfully or unsuccessfully,
-    `let us know <https://github.com/pytest-dev/pytest-django/issues/924>`_!
-
-``pytest-django`` has experimental support for multi-database configurations.
-Currently ``pytest-django`` does not specifically support Django's
-multi-database support, using the ``databases`` argument to the
-:func:`django_db <pytest.mark.django_db>` mark::
+``pytest-django`` has support for multi-database configurations using the
+``databases`` argument to the :func:`django_db <pytest.mark.django_db>` mark::
 
    @pytest.mark.django_db(databases=['default', 'other'])
    def test_spam():
        assert MyModel.objects.using('other').count() == 0
 
+If you don't specify ``databases``, only the default database is requested.
+To request all databases, you may use the shortcut ``'__all__'``.
+
 For details see :attr:`django.test.TransactionTestCase.databases` and
 :attr:`django.test.TestCase.databases`.
 

docs/database.rst

@@ -59,16 +59,10 @@ dynamically in a hook or fixture.
 
   :type databases: Iterable[str] | str | None
   :param databases:
-    .. caution::
-
-      This argument is **experimental** and is subject to change without
-      deprecation. We are still figuring out the best way to expose this
-      functionality. If you are using this successfully or unsuccessfully,
-      `let us know <https://github.com/pytest-dev/pytest-django/issues/924>`_!
 
     The ``databases`` argument defines which databases in a multi-database
     configuration will be set up and may be used by the test.  Defaults to
-    only the ``default`` database.  The special value ``"__all__"`` may be use
+    only the ``default`` database.  The special value ``"__all__"`` may be used
     to specify all configured databases.
     For details see :attr:`django.test.TransactionTestCase.databases` and
     :attr:`django.test.TestCase.databases`.