From 74c5f693f62bf3e74535bdb725b2c9cbccd5e7f8 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Thu, 13 Nov 2025 22:35:36 +0000 Subject: [PATCH] Add Django 6.0 to testing matrix --- docs/changes.rst | 1 + tox.ini | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index 532404dab..5c17fa1cd 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -7,6 +7,7 @@ Pending * Deprecated ``RedirectsPanel`` in favor of ``HistoryPanel`` for viewing toolbar data from redirected requests. * Fixed support for generating code coverage comments in PRs. +* Added Django 6.0 to the testing matrix. 6.1.0 (2025-10-30) ------------------ diff --git a/tox.ini b/tox.ini index 37887e952..361fd9abd 100644 --- a/tox.ini +++ b/tox.ini @@ -4,9 +4,10 @@ envlist = docs packaging py{39,310,311,312}-dj{42}-{sqlite,postgresql,postgis,mysql} - py{310,311,312}-dj{42,50,51,52}-{sqlite,postgresql,psycopg3,postgis,mysql} - py{313}-dj{51,52,main}-{sqlite,psycopg3,postgis3,mysql} - py{314}-dj{52,main}-{sqlite,psycopg3,postgis3,mysql} + py{310,311}-dj{42,50,51,52}-{sqlite,postgresql,psycopg3,postgis,mysql} + py{312}-dj{42,50,51,52,60}-{sqlite,postgresql,psycopg3,postgis,mysql} + py{313}-dj{51,52,60,main}-{sqlite,psycopg3,postgis3,mysql} + py{314}-dj{52,60,main}-{sqlite,psycopg3,postgis3,mysql} [testenv] deps = @@ -14,6 +15,7 @@ deps = dj50: django~=5.0.2 dj51: django~=5.1.0 dj52: django~=5.2.0a1 + dj60: django~=6.0a1 djmain: https://github.com/django/django/archive/main.tar.gz postgresql: psycopg2-binary psycopg3: psycopg[binary] @@ -54,28 +56,28 @@ pip_pre = True commands = python -b -W always -m coverage run -m django test -v2 {posargs:tests} -[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,main}-{postgresql,psycopg3}] +[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,60,main}-{postgresql,psycopg3}] setenv = {[testenv]setenv} DB_BACKEND = postgresql DB_PORT = {env:DB_PORT:5432} -[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,main}-{postgis,postgis3}] +[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,60,main}-{postgis,postgis3}] setenv = {[testenv]setenv} DB_BACKEND = postgis DB_PORT = {env:DB_PORT:5432} -[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,main}-mysql] +[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,60,main}-mysql] setenv = {[testenv]setenv} DB_BACKEND = mysql DB_PORT = {env:DB_PORT:3306} -[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,main}-sqlite] +[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,60,main}-sqlite] setenv = {[testenv]setenv} DB_BACKEND = sqlite3