Skip to content

Commit 777827a

Browse files
committed
Merge branch 'support/wagtail-70-upgrade' into staging
2 parents 1a10958 + e93f3eb commit 777827a

File tree

7 files changed

+224
-211
lines changed

7 files changed

+224
-211
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
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.11.2' # keep in sync with pyproject.toml
6+
rev: 'v0.11.12' # keep in sync with pyproject.toml
77
hooks:
88
- id: ruff
99
args: [--fix, --exit-non-zero-on-fix]
@@ -39,7 +39,7 @@ repos:
3939
poetry.lock
4040
)$
4141
- repo: https://github.com/rtts/djhtml
42-
rev: 3.0.6
42+
rev: 3.0.8
4343
hooks:
4444
- id: djhtml
4545
- repo: https://github.com/python-poetry/poetry

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file. This project doesn’t follow any versioning scheme.
4+
5+
Add your changes to the Unreleased section and move them to the appropriate section when they are merged.
6+
7+
## Unreleased
8+
9+
- Wagtail 7.0 upgrade [#396](https://github.com/torchbox/torchbox.com/pull/396)
10+
11+
---
12+
13+
## 2025 (pre-changelog 04-06-2025)
14+
15+
This changelog was started on 04-06-2025. Before that date, changes were not documented here.

docs/upgrading.md

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

7575
### Check these packages for updates
7676

77-
**Last checked** Wagtail 6.4 upgrade
77+
**Last checked** Wagtail 7.0 upgrade
7878

7979
- wagtail-accessibility
8080
- [wagtail-lite-youtube-embed](front-end/lite-youtube.md)
@@ -84,8 +84,6 @@ As much as possible, we want to use the official releases available on PyPI for
8484

8585
## Custom wagtail admin templates
8686

87-
**Last checked** Wagtail 6.4 upgrade
87+
**Last checked** Wagtail 7.0 upgrade
8888

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
89+
Add references to any custom templates that override the Wagtail admin templates. These should be checked to ensure they still work as expected after the upgrade.

0 commit comments

Comments
 (0)