From d8982afbddb08f76ac2572a5c8b82db3745997aa Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 27 Jan 2025 18:14:35 -0600 Subject: [PATCH 1/2] Add Django 5.2 to tox matrix --- tox.ini | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tox.ini b/tox.ini index 0c9b26b2f..c8f4a6815 100644 --- a/tox.ini +++ b/tox.ini @@ -4,14 +4,15 @@ envlist = docs packaging py{39,310,311,312}-dj{42}-{sqlite,postgresql,postgis,mysql} - py{310,311,312}-dj{42,50,51,main}-{sqlite,postgresql,psycopg3,postgis,mysql} - py{313}-dj{51,main}-{sqlite,psycopg3,postgis3,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} [testenv] deps = dj42: django~=4.2.1 dj50: django~=5.0.2 dj51: django~=5.1.0 + dj52: django~=5.2.0a1 djmain: https://github.com/django/django/archive/main.tar.gz postgresql: psycopg2-binary psycopg3: psycopg[binary] @@ -51,28 +52,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}-dj{42,50,51,main}-{postgresql,psycopg3}] +[testenv:py{39,310,311,312,313}-dj{42,50,51,52,main}-{postgresql,psycopg3}] setenv = {[testenv]setenv} DB_BACKEND = postgresql DB_PORT = {env:DB_PORT:5432} -[testenv:py{39,310,311,312,313}-dj{42,50,51,main}-{postgis,postgis3}] +[testenv:py{39,310,311,312,313}-dj{42,50,51,52,main}-{postgis,postgis3}] setenv = {[testenv]setenv} DB_BACKEND = postgis DB_PORT = {env:DB_PORT:5432} -[testenv:py{39,310,311,312,313}-dj{42,50,51,main}-mysql] +[testenv:py{39,310,311,312,313}-dj{42,50,51,52,main}-mysql] setenv = {[testenv]setenv} DB_BACKEND = mysql DB_PORT = {env:DB_PORT:3306} -[testenv:py{39,310,311,312,313}-dj{42,50,51,main}-sqlite] +[testenv:py{39,310,311,312,313}-dj{42,50,51,52,main}-sqlite] setenv = {[testenv]setenv} DB_BACKEND = sqlite3 From 34ee8c0f1ec97c47eb5a602882c972446f2ab040 Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 27 Jan 2025 18:16:42 -0600 Subject: [PATCH 2/2] Update changelog --- docs/changes.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/changes.rst b/docs/changes.rst index bb5554fb8..9010650ba 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -4,6 +4,8 @@ Change log Pending ------- +* Added Django 5.2 to the tox matrix. + 5.0.1 (2025-01-13) ------------------ * Fixing the build and release process. No functional changes.