Skip to content

Commit 6de85db

Browse files
rxm7706vsalvino
andauthored
Support Wagtail 7.0-7.1 & Django 5.2 LTS (#702)
Signed-off-by: rxm7706 <95496360+rxm7706@users.noreply.github.com> Co-authored-by: Vince Salvino <salvino@coderedcorp.com>
1 parent 7716f5b commit 6de85db

7 files changed

Lines changed: 65 additions & 40 deletions

File tree

azure-pipelines.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,25 @@ stages:
2929
matrix:
3030
# Oldest versions of python should use the oldest versions of
3131
# wagtail we support, for testing purposes.
32-
py3.9:
33-
PYTHON_VERSION: '3.9'
34-
WAGTAIL_VERSION: '6.3.*'
35-
TEMPLATE: 'basic'
3632
py3.10:
3733
PYTHON_VERSION: '3.10'
38-
WAGTAIL_VERSION: '6.3.*'
34+
WAGTAIL_VERSION: '7.0.*'
3935
TEMPLATE: 'basic'
4036
py3.11:
4137
PYTHON_VERSION: '3.11'
42-
WAGTAIL_VERSION: '6.4.*'
38+
WAGTAIL_VERSION: '7.1.*'
4339
TEMPLATE: 'basic'
4440
py3.12:
4541
PYTHON_VERSION: '3.12'
46-
WAGTAIL_VERSION: '6.*'
42+
WAGTAIL_VERSION: '7.1.*'
4743
TEMPLATE: 'basic'
4844
py3.13_basic:
4945
PYTHON_VERSION: '3.13'
50-
WAGTAIL_VERSION: '6.*'
46+
WAGTAIL_VERSION: '7.*'
5147
TEMPLATE: 'basic'
5248
py3.13_pro:
5349
PYTHON_VERSION: '3.13'
54-
WAGTAIL_VERSION: '6.*'
50+
WAGTAIL_VERSION: '7.*'
5551
TEMPLATE: 'pro'
5652

5753
steps:

coderedcms/templates/wagtailimportexport/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% block titletag %}{% blocktrans %}Import / export pages{% endblocktrans %}{% endblock %}
44
{% block content %}
55
{% trans "Import pages" as title_str %}
6-
{% include "wagtailadmin/shared/header.html" with title=title_str icon="download" %}
6+
{% include "wagtailadmin/shared/header.html" with title=title_str icon="upload" %}
77

88
<div class="nice-padding">
99
<h3>CSV</h3>

coderedcms/wagtail_hooks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,5 +122,5 @@ def register_import_export_menu_item():
122122
return ImportExportMenuItem(
123123
_("Import"),
124124
reverse("import_index"),
125-
classnames="icon icon-download",
125+
icon_name="upload",
126126
)

docs/releases/index.rst

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,30 @@ Wagtail CRX (previously CodeRed CMS) follows the
1212

1313
Supported Versions:
1414

15-
+--------------+---------+----------+---------------------------+
16-
| CRX version | Wagtail | Python | Support Status |
17-
+==============+=========+==========+===========================+
18-
| CRX 5.0 | 6.3-6.4 | 3.9-3.13 | Supported |
19-
+--------------+---------+----------+---------------------------+
20-
| CRX 4.1 | 6.3 | 3.9-3.13 | Supported |
21-
+--------------+---------+----------+---------------------------+
22-
| CRX 4.0 | 6.0-6.2 | 3.8-3.12 | Supported |
23-
+--------------+---------+----------+---------------------------+
24-
| CRX 3.x | 5.x | 3.8-3.12 | Supported |
25-
+--------------+---------+----------+---------------------------+
26-
| CRX 2.x | 4.x | 3.7-3.11 | Support contract required |
27-
+--------------+---------+----------+---------------------------+
28-
| CRX 1.x | 3.x | 3.7-3.11 | Support contract required |
29-
+--------------+---------+----------+---------------------------+
30-
| CRX 0.25 | 2.16 | 3.7-3.10 | Support contract required |
31-
+--------------+---------+----------+---------------------------+
15+
+--------------+---------+-----------+---------------------------+
16+
| CRX version | Wagtail | Python | Support Status |
17+
+==============+=========+===========+===========================+
18+
| CRX 6.0 | 7.0-7.1 | 3.10-3.13 | Supported |
19+
+--------------+---------+-----------+---------------------------+
20+
| CRX 5.0 | 6.3-6.4 | 3.9-3.13 | Supported |
21+
+--------------+---------+-----------+---------------------------+
22+
| CRX 4.1 | 6.3 | 3.9-3.13 | Supported |
23+
+--------------+---------+-----------+---------------------------+
24+
| CRX 4.0 | 6.0-6.2 | 3.8-3.12 | Support contract required |
25+
+--------------+---------+-----------+---------------------------+
26+
| CRX 3.x | 5.x | 3.8-3.12 | Support contract required |
27+
+--------------+---------+-----------+---------------------------+
28+
| CRX 2.x | 4.x | 3.7-3.11 | Support contract required |
29+
+--------------+---------+-----------+---------------------------+
30+
| CRX 1.x | 3.x | 3.7-3.11 | Support contract required |
31+
+--------------+---------+-----------+---------------------------+
32+
| CRX 0.25 | 2.16 | 3.7-3.10 | Support contract required |
33+
+--------------+---------+-----------+---------------------------+
3234

3335
.. toctree::
3436
:maxdepth: 1
3537

38+
v6.0.0
3639
v5.0.2
3740
v5.0.1
3841
v5.0.0

docs/releases/v6.0.0.rst

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
v6.0.0 release notes
2+
====================
3+
4+
5+
New features
6+
------------
7+
8+
* Support Wagtail 7.0 LTS and 7.1.
9+
10+
* Support Django 5.2 LTS.
11+
12+
* Support Python 3.10 to 3.13.
13+
14+
15+
Upgrade considerations
16+
----------------------
17+
18+
Dropped support for Python 3.9 which is reaching end of life soon.
19+
20+
Be sure to read the `Wagtail 7.0 upgrade considerations <https://docs.wagtail.org/en/stable/releases/7.0.html#upgrade-considerations-changes-affecting-all-projects>`_.
21+
22+
23+
Thank you!
24+
----------
25+
26+
Thanks to everyone who contributed to `6.0.0 on GitHub <https://github.com/coderedcorp/coderedcms/milestone/64?closed=1>`_.

pyproject.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -- PACKAGE --------------------------
22

33
[build-system]
4-
requires = ["setuptools>=65.5"]
4+
requires = ["setuptools>=78.0"]
55
build-backend = "setuptools.build_meta"
66

77
[project]
@@ -15,7 +15,6 @@ classifiers = [
1515
"Operating System :: OS Independent",
1616
"Programming Language :: Python",
1717
"Programming Language :: Python :: 3",
18-
"Programming Language :: Python :: 3.9",
1918
"Programming Language :: Python :: 3.10",
2019
"Programming Language :: Python :: 3.11",
2120
"Programming Language :: Python :: 3.12",
@@ -25,30 +24,31 @@ classifiers = [
2524
"Framework :: Django :: 4.2",
2625
"Framework :: Django :: 5.0",
2726
"Framework :: Django :: 5.1",
27+
"Framework :: Django :: 5.2",
2828
"Framework :: Wagtail",
29-
"Framework :: Wagtail :: 6",
29+
"Framework :: Wagtail :: 7",
3030
"Topic :: Internet :: WWW/HTTP",
3131
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
3232
"Topic :: Internet :: WWW/HTTP :: Site Management",
3333
]
3434
dependencies = [
35-
"beautifulsoup4>=4.8,<4.13", # should be the same as wagtail
35+
"beautifulsoup4>=4.8,<5", # should be the same as wagtail
3636
"django-eventtools==1.0.*",
37-
"django-bootstrap5==24.3",
37+
"django-bootstrap5==25.2",
3838
"Django>=4.2,<6.0", # should be the same as wagtail
3939
"geocoder==1.38.*",
40-
"icalendar==6.1.*",
41-
"wagtail>=6.3,<7.0",
42-
"wagtail-cache>=2.4,<3",
43-
"wagtail-flexible-forms==2.*",
44-
"wagtail-seo==3.*",
40+
"icalendar==6.3.*",
41+
"wagtail>=7.0,<8.0",
42+
"wagtail-cache==3.*",
43+
"wagtail-flexible-forms>=2.1,<3.0",
44+
"wagtail-seo>=3.1,<4.0",
4545
]
4646
description = "Wagtail + CodeRed Extensions enabling rapid development of marketing-focused websites."
4747
dynamic = ["version"]
4848
license = {file = "LICENSE.txt"}
4949
name = "coderedcms"
5050
readme = "README.md"
51-
requires-python = ">=3.9"
51+
requires-python = ">=3.10"
5252

5353
[project.scripts]
5454
coderedcms = "coderedcms.bin.coderedcms:main"

requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
build
66
jsmin
77
libsass
8-
setuptools>=65.5
8+
setuptools>=78.0
99
twine

0 commit comments

Comments
 (0)