Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]

steps:
- uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
default_language_version:
node: system
python: python3.12
python: python3.14
repos:
- repo: https://github.com/python/black
rev: 25.1.0
rev: 25.11.0
hooks:
- id: black
exclude: migrations/
- repo: https://github.com/PyCQA/isort
rev: 6.0.1
rev: 7.0.0
hooks:
- id: isort
- repo: https://github.com/pycqa/flake8
# flake8 config is in setup.cfg
rev: 7.1.2
rev: 7.3.0
hooks:
- id: flake8
- repo: https://github.com/pre-commit/mirrors-prettier
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

Wagtail 7.2 maintenance

- Tox testing add Wagtail 7.2
- Classifiers add Wagtail 7.2

Wagtail 7.0 maintenance

- Tox testing add Wagtail 7.0, 7.1 and Django 5.2
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ include_package_data = true
packages = find:
install_requires =
Django>=4.2
wagtail>=5.2
wagtail>=6.3
python-unsplash>=1.1.0, <1.2
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
]

development_extras = [
"black==25.1.0",
"flake8==7.1.2",
"isort==6.0.1",
"black==25.11.0",
"flake8==7.3.0",
"isort==7.0.0",
]

setup(
Expand All @@ -33,7 +33,7 @@
license="MIT",
packages=find_packages(exclude=["tests*"]),
include_package_data=True,
install_requires=["wagtail>=5.2", "python-unsplash>=1.1.0"],
install_requires=["wagtail>=6.3", "python-unsplash>=1.1.0"],
extras_require={
"testing": testing_extras,
"development": development_extras,
Expand All @@ -46,7 +46,6 @@
"Framework :: Django :: 5.1",
"Framework :: Django :: 5.2",
"Framework :: Wagtail",
"Framework :: Wagtail :: 5",
"Framework :: Wagtail :: 6",
"Framework :: Wagtail :: 7",
],
Expand Down
17 changes: 7 additions & 10 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[gh-actions]
python =
3.9: py39
3.10: py310
3.11: py311
3.12: py312
3.13: py313
3.14: py314

[gh-actions:env]
DJANGO =
Expand All @@ -13,38 +13,35 @@ DJANGO =
5.2: dj52

WAGTAIL =
5.2: wt52
6.3: wt63
6.4: wt64
7.0: wt70
7.1: wt71
7.2: wt72

[tox]
skipsdist = True
usedevelop = True

envlist =
py{39,310,311,312}-dj42-wt{52,63,64,70,71}
py{310,311,312,313}-dj{51,52}-wt{63,64,70,71}
py{310,311,312}-dj42-wt{63,70,72}
py{310,311,312,313}-dj{51,52}-wt{63,70,72}
py314-dj52-wt72

[testenv]
description = Unit tests
install_command = pip install -e ".[testing]" -U {opts} {packages}
commands = coverage run --source=wagtailmakeup runtests.py

basepython =
py39: python3.9
py310: python3.10
py311: python3.11
py312: python3.12
py313: python3.13
py314: python3.14

deps =
dj42: Django>=4.2,<4.3
dj51: Django>=5.1,<5.2
dj52: Django>=5.2,<5.3
wt52: wagtail>=5.2,<5.3
wt63: wagtail>=6.3,<6.4
wt64: wagtail>=6.4,<6.5
wt70: wagtail>=7.0,<7.1
wt71: wagtail>=7.1,<7.2
wt72: wagtail>=7.2,<7.3
Loading