Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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/*
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ 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, and Python 3.14
* Refresh development dependency pins (coverage, factory_boy, black)

2.0 - 18th September 2024
-------------------------
Expand Down
15 changes: 7 additions & 8 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -46,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

Expand Down
13 changes: 7 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,6 +13,7 @@ python =
3.11: py311
3.12: py312
3.13: py313
3.14: py314

[testenv]
use_frozen_constraints = true
Expand All @@ -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 =
Expand Down
Loading