From 64e0b8d0e3e6143c27f077654997b46136671008 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Tue, 26 May 2026 17:05:39 +0100 Subject: [PATCH 1/3] Update supported Python, Django, and Wagtail versions Drop end-of-life targets and add current releases: * Drop Wagtail < 7.0 (6.3 LTS reached EOL 2026-05-01) * Drop Django < 5.2 (4.2 and 5.1 both EOL) * Add Django 6.0 support (Python 3.12+ only) * Add Wagtail 7.3 and 7.4 LTS support * Add Python 3.14 support and CI matrix entry Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/test.yml | 2 +- CHANGELOG.rst | 4 ++++ setup.cfg | 9 ++++----- tox.ini | 13 +++++++------ 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f51895f..930098f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: strategy: max-parallel: 4 matrix: - python: ["3.10", "3.11", "3.12"] + python: ["3.10", "3.11", "3.12", "3.13", "3.14"] fail-fast: false steps: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index dc89021..0d3e336 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,10 @@ Unreleased * Add tests for Wagtail 6.3, 6.4 and Python 3.13 (@ianmeigh) * Update tests to consider tasks managed by django-tasks are now deferred until the current transaction is committed (@ianmeigh) +* Drop support for Wagtail < 7.0, Django < 5.2 +* Add support for Django 6.0, Wagtail 7.4 LTS +* Add support for Python 3.14 +* Refresh development dependency pins (coverage, factory_boy, black) 2.0 - 18th September 2024 ------------------------- diff --git a/setup.cfg b/setup.cfg index ccc2b7b..742a03c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,13 +17,12 @@ classifiers = Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 Programming Language :: Python :: 3.13 + Programming Language :: Python :: 3.14 Topic :: Internet :: WWW/HTTP Framework :: Django - Framework :: Django :: 4.2 - Framework :: Django :: 5.1 Framework :: Django :: 5.2 + Framework :: Django :: 6.0 Framework :: Wagtail - Framework :: Wagtail :: 6 Framework :: Wagtail :: 7 keywords = wagtail @@ -35,8 +34,8 @@ keywords = [options] packages = find: install_requires = - Django >=4.2 - Wagtail >=6.3 + Django >=5.2 + Wagtail >=7.0 django-storages[boto3] <2 python_requires = >=3.10 diff --git a/tox.ini b/tox.ini index 505bb26..ba86f35 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,8 @@ [tox] envlist = - py{310,311,312}-dj42-wagtail{63,70,71} - py{311,312,313}-dj{51,52}-wagtail{63,70,71} + py{310,311,312,313}-dj52-wagtail70 + py{310,311,312,313,314}-dj52-wagtail{73,74} + py{312,313,314}-dj60-wagtail{73,74} flake8 isort black @@ -12,6 +13,7 @@ python = 3.11: py311 3.12: py312 3.13: py313 + 3.14: py314 [testenv] use_frozen_constraints = true @@ -21,12 +23,11 @@ setenv = PYTHONPATH = {toxinidir} DJANGO_SETTINGS_MODULE = wagtail_storages.tests.settings deps = - dj42: Django>=4.2,<4.3 - dj51: Django>=5.1,<5.2 dj52: Django>=5.2,<5.3 - wagtail63: wagtail>=6.3,<6.4 + dj60: Django>=6.0,<6.1 wagtail70: wagtail>=7.0,<7.1 - wagtail71: wagtail>=7.1,<7.2 + wagtail73: wagtail>=7.3,<7.4 + wagtail74: wagtail>=7.4,<7.5 wagtailmain: git+https://github.com/wagtail/wagtail.git@main#egg=Wagtail commands = From 0df7f8e6a436fe11370c2e595c399819040f6b1c Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Tue, 26 May 2026 17:05:52 +0100 Subject: [PATCH 2/3] Refresh dev tooling and modernise build step * Relax pinned dev dependencies (coverage, factory_boy, black) to ranges * Replace deprecated ``python setup.py bdist_wheel sdist`` with ``python -m build`` in the CI build job Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/test.yml | 4 ++-- setup.cfg | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 930098f..1300e6a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -62,10 +62,10 @@ jobs: python-version: 3 - name: Install dependencies - run: python -m pip install --upgrade setuptools wheel twine + run: python -m pip install --upgrade build twine - name: Build Python packages - run: python setup.py bdist_wheel sdist + run: python -m build - name: twine check run: twine check dist/* diff --git a/setup.cfg b/setup.cfg index 742a03c..89a7800 100644 --- a/setup.cfg +++ b/setup.cfg @@ -45,10 +45,10 @@ exclude = [options.extras_require] testing = - coverage ==7.5.2 - factory_boy ==3.3.0 + coverage >=7.6 + factory_boy >=3.3 moto[s3] >=5,<6 - black ==24.4.2 + black >=26.0 isort flake8 From 87cecf253d3c548e76ff5af9f5f5bdf594116320 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 28 May 2026 12:32:57 +0100 Subject: [PATCH 3/3] Condense lines in change log --- CHANGELOG.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0d3e336..d579a14 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,8 +7,7 @@ Unreleased * Update tests to consider tasks managed by django-tasks are now deferred until the current transaction is committed (@ianmeigh) * Drop support for Wagtail < 7.0, Django < 5.2 -* Add support for Django 6.0, Wagtail 7.4 LTS -* Add support for Python 3.14 +* Add support for Django 6.0, Wagtail 7.4 LTS, and Python 3.14 * Refresh development dependency pins (coverage, factory_boy, black) 2.0 - 18th September 2024