From 0ee128295b15c0522f997e3256a2ef56578e63ff Mon Sep 17 00:00:00 2001 From: Paolo Melchiorre Date: Tue, 28 Nov 2023 08:36:34 +0100 Subject: [PATCH] Fix #1858 -- Drop support for Django 4.0 --- docs/changes.rst | 1 + pyproject.toml | 1 - tox.ini | 10 ++++------ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index a13ca5b0f..15c380ddd 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -4,6 +4,7 @@ Change log Pending ------- +* Dropped support for Django 4.0. * Added Python 3.12 to test matrix. * Removed outdated third-party panels from the list. * Avoided the unnecessary work of recursively quoting SQL parameters. diff --git a/pyproject.toml b/pyproject.toml index 5f7abf41e..e529808cb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,6 @@ classifiers = [ "Environment :: Web Environment", "Framework :: Django", "Framework :: Django :: 3.2", - "Framework :: Django :: 4.0", "Framework :: Django :: 4.1", "Framework :: Django :: 4.2", "Framework :: Django :: 5.0", diff --git a/tox.ini b/tox.ini index 5e3778329..254fb9b76 100644 --- a/tox.ini +++ b/tox.ini @@ -4,14 +4,12 @@ envlist = docs packaging py{38,39,310}-dj32-{sqlite,postgresql,postgis,mysql} - py310-dj40-sqlite py{310,311}-dj41-{sqlite,postgresql,postgis,mysql} py{310,311,312}-dj{42,50,main}-{sqlite,postgresql,psycopg3,postgis,mysql} [testenv] deps = dj32: django~=3.2.9 - dj40: django~=4.0.0 dj41: django~=4.1.3 dj42: django~=4.2.1 dj50: django~=5.0a1 @@ -51,28 +49,28 @@ pip_pre = True commands = python -b -W always -m coverage run -m django test -v2 {posargs:tests} -[testenv:py{38,39,310,311,312}-dj{32,40,41,42,50,main}-{postgresql,psycopg3}] +[testenv:py{38,39,310,311,312}-dj{32,41,42,50,main}-{postgresql,psycopg3}] setenv = {[testenv]setenv} DB_BACKEND = postgresql DB_PORT = {env:DB_PORT:5432} -[testenv:py{38,39,310,311,312}-dj{32,40,41,42,50,main}-postgis] +[testenv:py{38,39,310,311,312}-dj{32,41,42,50,main}-postgis] setenv = {[testenv]setenv} DB_BACKEND = postgis DB_PORT = {env:DB_PORT:5432} -[testenv:py{38,39,310,311,312}-dj{32,40,41,42,50,main}-mysql] +[testenv:py{38,39,310,311,312}-dj{32,41,42,50,main}-mysql] setenv = {[testenv]setenv} DB_BACKEND = mysql DB_PORT = {env:DB_PORT:3306} -[testenv:py{38,39,310,311,312}-dj{32,40,41,42,50,main}-sqlite] +[testenv:py{38,39,310,311,312}-dj{32,41,42,50,main}-sqlite] setenv = {[testenv]setenv} DB_BACKEND = sqlite3