From ef9d103aef7e58f206f78049fc8057447751b7e7 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 28 Jul 2026 15:45:05 -0400 Subject: [PATCH 1/5] Update Django version compatibility in README --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 123217f0..b2e975c1 100644 --- a/README.rst +++ b/README.rst @@ -32,7 +32,7 @@ pytest-django allows you to test your Django project/applications with the `_ * Version compatibility: - * Django: 4.2, 5.1, 5.2, 6.0 and latest main branch (compatible at the time + * Django: 5.2, 6.0, 6.1 and latest main branch (compatible at the time of each release) * Python: CPython>=3.10 or PyPy 3 * pytest: >=7.0 From 17168d116fec126f8600e923d4a0d57c2a9ad749 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 28 Jul 2026 15:47:16 -0400 Subject: [PATCH 2/5] Wire in django 6.1 tests --- .github/workflows/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a545a77..17a2a16c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -91,8 +91,13 @@ jobs: - {name: py312-dj60-postgres-xdist-coverage, python: '3.12', allow_failure: false} - {name: py313-dj60-sqlite-coverage, python: '3.13', allow_failure: false} - {name: py314-dj60-postgres-xdist-coverage, python: '3.14', allow_failure: false} + + # Django 6.1 / Python 3.12–3.14 + - {name: py312-dj61-postgres-xdist-coverage, python: '3.12', allow_failure: false} + - {name: py313-dj61-sqlite-coverage, python: '3.13', allow_failure: false} + - {name: py314-dj61-postgres-xdist-coverage, python: '3.14', allow_failure: false} # Pin the minimum supported pytest on the latest stable combo. - - {name: py313-dj60-sqlite-pytestmin-coverage, python: '3.13', allow_failure: false} + - {name: py313-dj61-sqlite-pytestmin-coverage, python: '3.14', allow_failure: false} # Django main / Python [latest] - {name: py313-djmain-sqlite-coverage, python: '3.13', allow_failure: true} From b3cf515b49a9e04f4df865b66be00d079dbbf8ab Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 28 Jul 2026 15:49:21 -0400 Subject: [PATCH 3/5] Update changelog.rst --- docs/changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 98c7dcdd..d7787d8d 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -7,6 +7,7 @@ v4.12.1 (unreleased) Compatibility ^^^^^^^^^^^^^ +* Official Django 6.1 support. * Dropped support for Django 4.2 and 5.1. Bugfixes From 0ccca518d4d333761e1a7939cce45a5798bda1a0 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Thu, 30 Jul 2026 16:08:13 -0400 Subject: [PATCH 4/5] Updates... --- .github/workflows/main.yml | 5 ----- docs/contributing.rst | 6 +++--- pyproject.toml | 2 +- tox.ini | 7 +++---- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 17a2a16c..0d2f6899 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -87,11 +87,6 @@ jobs: - {name: py313-dj52-sqlite-coverage, python: '3.13', allow_failure: false} - {name: py314-dj52-postgres-xdist-coverage, python: '3.14', allow_failure: false} - # Django 6.0 / Python 3.12–3.14 - - {name: py312-dj60-postgres-xdist-coverage, python: '3.12', allow_failure: false} - - {name: py313-dj60-sqlite-coverage, python: '3.13', allow_failure: false} - - {name: py314-dj60-postgres-xdist-coverage, python: '3.14', allow_failure: false} - # Django 6.1 / Python 3.12–3.14 - {name: py312-dj61-postgres-xdist-coverage, python: '3.12', allow_failure: false} - {name: py313-dj61-sqlite-coverage, python: '3.13', allow_failure: false} diff --git a/docs/contributing.rst b/docs/contributing.rst index 7668cd33..9a7643f4 100644 --- a/docs/contributing.rst +++ b/docs/contributing.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 py313-dj60-postgres,py314-dj62-mysql + $ tox -e py313-dj61-postgres,py314-dj52-mysql -This will run the tests on Python 3.13/Django 60/PostgeSQL and Python -3.14/Django 6.2/MySQL. +This will run the tests on Python 3.13/Django 6.1/PostgeSQL and Python +3.14/Django 5.2/MySQL. Measuring test coverage diff --git a/pyproject.toml b/pyproject.toml index 1349d7ba..5baab9b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ classifiers = [ "Development Status :: 5 - Production/Stable", "Framework :: Django", "Framework :: Django :: 5.2", - "Framework :: Django :: 6.0", + "Framework :: Django :: 6.1", "Intended Audience :: Developers", "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", diff --git a/tox.ini b/tox.ini index 1966812f..6680e769 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = - py314-dj{main,60,52}-postgres - py313-dj{main,60,52}-postgres - py312-dj{main,60,52}-postgres + py314-dj{main,61,52}-postgres + py313-dj{main,61,52}-postgres + py312-dj{main,61,52}-postgres py311-dj{52}-postgres py310-dj{52}-postgres linting @@ -17,7 +17,6 @@ dependency_groups = deps = djmain: https://github.com/django/django/archive/main.tar.gz dj61: Django>=6.1a1,<6.2 - dj60: Django>=6.0a1,<6.1 dj52: Django>=5.2a1,<6.0 pytestmin: pytest>=7.0,<7.1 From 1c9f705c1bfc5fee6835ee4034d4a84707f4affc Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Mon, 10 Aug 2026 10:29:29 -0400 Subject: [PATCH 5/5] Update changelog.rst --- docs/changelog.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 3928d790..e1c8a982 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,14 @@ Changelog ========= +v4.15.0 (unreleased) +-------------------- + +Compatibility +^^^^^^^^^^^^^ + +* Official Django 6.1 support. + v4.14.0 (2026-08-10) -------------------- @@ -23,7 +31,6 @@ v4.13.0 (2026-08-06) Compatibility ^^^^^^^^^^^^^ -* Official Django 6.1 support. * Dropped support for Django 4.2 and 5.1. Improvements