Skip to content

Commit cf5afaa

Browse files
authored
Merge pull request #385 from torchbox/support/wagtail-64-upgrade
Upgrade Wagtail to 6.4.1
2 parents 36444b3 + 772d533 commit cf5afaa

File tree

14 files changed

+295
-453
lines changed

14 files changed

+295
-453
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
steps:
8989
- uses: actions/checkout@v4
9090
- name: Install Poetry
91-
run: pipx install poetry==1.8.3 # Make sure this matches POETRY_VERSION in the Dockerfile
91+
run: pipx install poetry==1.8.5 # Make sure this matches POETRY_VERSION in the Dockerfile
9292
- name: Set up Python
9393
uses: actions/setup-python@v5
9494
with:

.pre-commit-config.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ default_language_version:
33
python: python3.13
44
repos:
55
- repo: https://github.com/astral-sh/ruff-pre-commit
6-
rev: 'v0.9.1' # keep in sync with pyproject.toml
6+
rev: 'v0.11.2' # keep in sync with pyproject.toml
77
hooks:
88
- id: ruff
99
args: [--fix, --exit-non-zero-on-fix]
@@ -42,3 +42,10 @@ repos:
4242
rev: 3.0.6
4343
hooks:
4444
- id: djhtml
45+
- repo: https://github.com/python-poetry/poetry
46+
rev: '1.8.5' # keep version in sync with version installed in the Dockerfile
47+
hooks:
48+
- id: poetry-lock
49+
# Never update dependencies and only run on changes to pyproject.toml
50+
args: [--no-update]
51+
files: ^pyproject.toml$

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM python:3.13 as production
2121
ARG POETRY_INSTALL_ARGS="--no-dev"
2222

2323
# IMPORTANT: Remember to review both of these when upgrading
24-
ARG POETRY_VERSION=1.8.3
24+
ARG POETRY_VERSION=1.8.5
2525

2626
# Install dependencies in a virtualenv
2727
ENV VIRTUAL_ENV=/venv

docs/upgrading.md

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,18 @@ As much as possible, we want to use the official releases available on PyPI for
7474

7575
### Check these packages for updates
7676

77-
(This list may not be exhaustive)
77+
**Last checked** Wagtail 6.4 upgrade
7878

79-
- [lite youtube](front-end/lite-youtube.md)
80-
- [wagtail markdown](front-end/markdown-codehilite.md)
79+
- wagtail-accessibility
80+
- [wagtail-lite-youtube-embed](front-end/lite-youtube.md)
81+
- [wagtail-markdown](front-end/markdown-codehilite.md)
82+
- wagtailmedia
83+
- wagtail-purge
84+
85+
## Custom wagtail admin templates
86+
87+
**Last checked** Wagtail 6.4 upgrade
88+
89+
Wagtail core is expected to see an update to prevent the preview panel from scroll at every content update. To prevent this from happening until then, fix has been applied to the `tbx/project_styleguide/templates/patterns/base.html` template.
90+
91+
Further information is available in a MR for Wagtail Kit: https://git.torchbox.com/internal/wagtail-kit/-/merge_requests/973

0 commit comments

Comments
 (0)