Skip to content

Add support for Wagtail 6.3 and 6.4 #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 7, 2025
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
## Unreleased

### Added

- Support for Wagtail 6.3 and 6.4 and Python 3.13 ([#416](https://github.com/torchbox/wagtail-grapple/pull/416)) @mgax

### Removed

- Support for Wagtail < 6.3 and Python 3.8 ([#416](https://github.com/torchbox/wagtail-grapple/pull/416)) @mgax

## [0.27.0] - 2024-09-24

### Added
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# WARNING: THIS IS NOT FOR USE IN PRODUCTION IN ANY SHAPE OR FORM.

# Use an official Python runtime as a parent image
FROM python:3.8
FROM python:3.9
LABEL maintainer="[email protected]"

# Set environment varibles
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ Getting Grapple installed is designed to be as simple as possible!
### Prerequisites

```
Python >= 3.8
Wagtail >= 5.2
Python >= 3.9
Wagtail >= 6.3
Django >= 4.2
```

Expand Down Expand Up @@ -181,8 +181,8 @@ Any contributions [you make](https://github.com/torchbox/wagtail-grapple/graphs/

Wagtail Grapple supports:

- Python 3.8, 3.9, 3.10 3.11 and 3.12
- Wagtail >= 5.2
- Python 3.9, 3.10, 3.11, 3.12 and 3.13
- Wagtail >= 6.3

## License

Expand Down
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,18 @@ classifiers = [
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Framework :: Wagtail",
"Framework :: Wagtail :: 5",
"Framework :: Wagtail :: 6",
]
dynamic = ["version"]
requires-python = ">=3.8"
requires-python = ">=3.9"
dependencies = [
"Wagtail>=5.2",
"Wagtail>=6.3",
"graphene-django>=3,<4",
"wagtail-headless-preview"
]
Expand Down
2 changes: 1 addition & 1 deletion tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ruff==0.0.287

# Runtime requirements
Django>=4.2,<5.1
wagtail>=5.2,<6.3
wagtail>=6.3,<6.5
graphene-django>=3.0.0
factory-boy==3.2.1
wagtail-factories>=4.1.0
Expand Down
8 changes: 8 additions & 0 deletions tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,14 @@

EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"

# Make sure the search index is updated immediately during tests
TASKS = {
"default": {
"BACKEND": "django_tasks.backends.immediate.ImmediateBackend",
"ENQUEUE_ON_COMMIT": False,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This took me way too long to figure out. I need to reach for the release notes more often 🙃

}
}


with contextlib.suppress(ImportError):
from .local import * # noqa: F403
12 changes: 12 additions & 0 deletions tests/testapp/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -726,4 +726,16 @@ class Migration(migrations.Migration):
},
bases=(wagtail.images.models.ImageFileMixin, models.Model),
),
migrations.AddField(
model_name="customimage",
name="description",
field=models.CharField(
blank=True, default="", max_length=255, verbose_name="description"
),
),
migrations.AlterField(
model_name="customdocument",
name="file_size",
field=models.PositiveBigIntegerField(editable=False, null=True),
),
]
14 changes: 8 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@
min_version = 4.0

envlist =
py{38,39,310,311,312}-django{42}-wagtail{62}
py{310,311,312}-django{50}-wagtail{62}
py{39,310,311,312}-django{42}-wagtail{63,64}
py{310,311,312}-django{50}-wagtail{63,64}
py{310,311,312,313}-django{51}-wagtail{63,64}
interactive

[gh-actions]
python =
3.8: py38
3.9: py39
3.10: py310
3.11: py311
3.12: py312
3.13: py313

[gh-actions:env]
DB =
Expand Down Expand Up @@ -45,8 +46,9 @@ deps =

django42: Django>=4.2,<5.0
django50: Django>=5.0,<5.1
wagtail62: wagtail>=6.2,<6.3
interactive: wagtail>=5.2
django51: Django>=5.1,<5.2
wagtail63: wagtail>=6.3,<6.4
wagtail64: wagtail>=6.4,<6.5

commands =
python -m coverage run manage.py test {posargs: -v1} --exclude-tag=needs-custom-settings
Expand All @@ -73,7 +75,7 @@ description = An interactive environment for local testing purposes
base_python = python3.11

deps =
wagtail>=5.2
wagtail>=6.3

commands_pre =
python manage.py makemigrations
Expand Down
Loading