From c157440166e9cdb8b4001b1083ef1eb53ac88dff Mon Sep 17 00:00:00 2001 From: Matthias Kestenholz Date: Sun, 5 May 2024 16:25:32 +0200 Subject: [PATCH] Restore support for unsupported Django versions --- .pre-commit-config.yaml | 2 +- CHANGELOG.md | 1 - pyproject.toml | 5 ++++- tox.ini | 7 +++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 33b84e0..af2e96b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: rev: 1.16.0 hooks: - id: django-upgrade - args: [--target-version, "4.2"] + args: [--target-version, "3.2"] - repo: https://github.com/astral-sh/ruff-pre-commit rev: "v0.3.3" hooks: diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ba0deb..7eec4d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ - Updated the esbuild version. - Changed the build step to also send the CSS through esbuild's minificator. - Added spanish translations of the cookie banner. -- Dropped compatibility with Django before 4.2. - Added Python 3.12 and Django 5.0. - Added experimental support for Google Consent Management. Add the `f3cc/gcm.js` asset to pass the users general consent to GA. diff --git a/pyproject.toml b/pyproject.toml index 06a1ef2..5003d90 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,6 +15,9 @@ authors = [ 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", "Intended Audience :: Developers", @@ -30,7 +33,7 @@ classifiers = [ "Topic :: Software Development :: Libraries :: Application Frameworks", ] dependencies = [ - "Django>=4.2", + "Django>=3.2", "feincms3>=0.37", ] diff --git a/tox.ini b/tox.ini index 8221bb0..9f5354b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,8 @@ [tox] envlist = - py{39,310}-dj{42} - py{310,311,312}-dj{42,50,main} + py{39,310}-dj{32,41,42} + py{310,311}-dj{32,41,42,50,main} + py{312}-dj{42,50,main} [testenv] usedevelop = true @@ -10,6 +11,8 @@ commands = python -Wd {envbindir}/coverage run tests/manage.py test -v2 --keepdb {posargs:testapp} coverage report -m deps = + dj32: Django>=3.2,<4.0 + dj41: Django>=4.1,<4.2 dj42: Django>=4.2,<5.0 dj50: Django>=5.0,<5.1 djmain: https://github.com/django/django/archive/main.tar.gz