Skip to content

Commit 32dc6ee

Browse files
committed
Merge remote-tracking branch 'upstream/main' into gmt-pinned-versions
* upstream/main: More human-friendly WAGTAIL_SITE_NAME Upgrade to Wagtail 6.3
2 parents cf23c0d + d026264 commit 32dc6ee

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

bakerydemo/settings/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
}
195195

196196
# Wagtail settings
197-
WAGTAIL_SITE_NAME = "bakerydemo"
197+
WAGTAIL_SITE_NAME = "The Wagtail Bakery"
198198

199199
WAGTAIL_I18N_ENABLED = True
200200

readme.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ You can run the Wagtail demo locally without setting up Vagrant or Docker and si
125125

126126
#### Dependencies
127127

128-
- Python 3.10, 3.11 or 3.12
128+
- Python 3.10, 3.11, 3.12 or 3.13
129129
- [Virtualenv](https://virtualenv.pypa.io/en/stable/installation.html)
130130
- [VirtualenvWrapper](https://virtualenvwrapper.readthedocs.io/en/latest/install.html) (optional)
131131

@@ -229,6 +229,7 @@ By default, `django-csp` is not enabled since Wagtail isn't fully compatible yet
229229

230230
The `main` branch of this demo is designed to work with both the latest stable release and the latest `main` branch (development version) of Wagtail. To run the demo against a specific version of Wagtail, we have created [git tags](https://github.com/wagtail/bakerydemo/tags) for the latest commits that work with each feature release.
231231

232+
- [`v6.2`](https://github.com/wagtail/bakerydemo/releases/tag/v6.2)
232233
- [`v6.1`](https://github.com/wagtail/bakerydemo/releases/tag/v6.1)
233234
- [`v6.0`](https://github.com/wagtail/bakerydemo/releases/tag/v6.0)
234235
- [`v5.2`](https://github.com/wagtail/bakerydemo/releases/tag/v5.2)

requirements/base.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Django==5.0.9
1+
Django==5.1.0
22
django-dotenv==1.4.2
3-
wagtail==6.3.0
3+
wagtail==6.3.1
44
wagtail-font-awesome-svg>=1,<2
55
django-debug-toolbar>=4.2,<5
66
django-extensions==3.2.3

0 commit comments

Comments
 (0)