From ed520b6327caa6c4bf3864adb7b684795bd914c9 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 3 Jan 2024 15:05:47 +0000 Subject: [PATCH] Formalise support for Django 5; drop support for 4.0-4.1 --- .github/workflows/test.yml | 14 +------------- tox.ini | 10 +++++----- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c6c3c95..7ab7347 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,18 +18,6 @@ jobs: database: "postgresql" psycopg: "psycopg2>=2.9.2" experimental: false - - python: "3.9" - django: "Django>=4.0,<4.1" - taggit: "django-taggit>=2.1.0" - database: "sqlite3" - psycopg: "psycopg2>=2.9.2" - experimental: false - - python: "3.10" - django: "Django>=4.1,<4.2" - taggit: "django-taggit>=2.1.0" - database: "postgresql" - psycopg: "psycopg2>=2.9.2" - experimental: false - python: "3.11" django: "Django>=4.2,<4.3" taggit: "django-taggit>=2.1.0" @@ -37,7 +25,7 @@ jobs: psycopg: "psycopg2>=2.9.2" experimental: false - python: "3.12" - django: "Django>=4.2,<4.3" + django: "Django>=5.0,<5.1" taggit: "django-taggit>=2.1.0" database: "sqlite3" psycopg: "psycopg2>=2.9.2" diff --git a/tox.ini b/tox.ini index 9b771cb..6994e74 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,9 @@ [tox] envlist = - py{38,39}-dj{32,41,42}-{sqlite,postgres}-taggit2 - py{310}-dj{32,41,42,50stable,master}-{sqlite,postgres}-taggit2 - py{311}-dj{41,42,50stable,master}-{sqlite,postgres}-taggit2 - py{312}-dj{41,42,50stable,master}-{sqlite,postgres}-taggit2 + py{38,39}-dj{32,42}-{sqlite,postgres}-taggit2 + py{310}-dj{32,42,50,50stable,master}-{sqlite,postgres}-taggit2 + py{311}-dj{42,50,50stable,master}-{sqlite,postgres}-taggit2 + py{312}-dj{42,50,50stable,master}-{sqlite,postgres}-taggit2 [testenv] allowlist_externals = ./runtests.py @@ -20,8 +20,8 @@ deps = taggit2: django-taggit>=2.0 pytz>=2022.4 dj32: Django>=3.2,<3.3 - dj41: Django>=4.1,<4.2 dj42: Django>=4.2,<4.3 + dj50: Django>=5.0,<5.1 dj50stable: git+https://github.com/django/django.git@stable/5.0.x#egg=Django djmaster: git+https://github.com/django/django.git@main#egg=Django postgres: psycopg2>=2.9