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>

Author: rxm7706

azure-pipelines.yml

@@ -29,29 +29,25 @@ stages:
       matrix:
         # Oldest versions of python should use the oldest versions of
         # wagtail we support, for testing purposes.
-        py3.9:
-          PYTHON_VERSION: '3.9'
-          WAGTAIL_VERSION: '6.3.*'
-          TEMPLATE: 'basic'
         py3.10:
           PYTHON_VERSION: '3.10'
-          WAGTAIL_VERSION: '6.3.*'
+          WAGTAIL_VERSION: '7.0.*'
           TEMPLATE: 'basic'
         py3.11:
           PYTHON_VERSION: '3.11'
-          WAGTAIL_VERSION: '6.4.*'
+          WAGTAIL_VERSION: '7.1.*'
           TEMPLATE: 'basic'
         py3.12:
           PYTHON_VERSION: '3.12'
-          WAGTAIL_VERSION: '6.*'
+          WAGTAIL_VERSION: '7.1.*'
           TEMPLATE: 'basic'
         py3.13_basic:
           PYTHON_VERSION: '3.13'
-          WAGTAIL_VERSION: '6.*'
+          WAGTAIL_VERSION: '7.*'
           TEMPLATE: 'basic'
         py3.13_pro:
           PYTHON_VERSION: '3.13'
-          WAGTAIL_VERSION: '6.*'
+          WAGTAIL_VERSION: '7.*'
           TEMPLATE: 'pro'
 
     steps:

coderedcms/templates/wagtailimportexport/index.html

@@ -3,7 +3,7 @@
 {% block titletag %}{% blocktrans %}Import / export pages{% endblocktrans %}{% endblock %}
 {% block content %}
     {% trans "Import pages" as title_str %}
-    {% include "wagtailadmin/shared/header.html" with title=title_str icon="download" %}
+    {% include "wagtailadmin/shared/header.html" with title=title_str icon="upload" %}
 
     <div class="nice-padding">
         <h3>CSV</h3>

coderedcms/wagtail_hooks.py

@@ -122,5 +122,5 @@ def register_import_export_menu_item():
     return ImportExportMenuItem(
         _("Import"),
         reverse("import_index"),
-        classnames="icon icon-download",
+        icon_name="upload",
     )

docs/releases/index.rst

@@ -12,27 +12,30 @@ Wagtail CRX (previously CodeRed CMS) follows the
 
 Supported Versions:
 
-+--------------+---------+----------+---------------------------+
-| CRX version  | Wagtail | Python   | Support Status            |
-+==============+=========+==========+===========================+
-| CRX 5.0      | 6.3-6.4 | 3.9-3.13 | Supported                 |
-+--------------+---------+----------+---------------------------+
-| CRX 4.1      | 6.3     | 3.9-3.13 | Supported                 |
-+--------------+---------+----------+---------------------------+
-| CRX 4.0      | 6.0-6.2 | 3.8-3.12 | Supported                 |
-+--------------+---------+----------+---------------------------+
-| CRX 3.x      | 5.x     | 3.8-3.12 | Supported                 |
-+--------------+---------+----------+---------------------------+
-| CRX 2.x      | 4.x     | 3.7-3.11 | Support contract required |
-+--------------+---------+----------+---------------------------+
-| CRX 1.x      | 3.x     | 3.7-3.11 | Support contract required |
-+--------------+---------+----------+---------------------------+
-| CRX 0.25     | 2.16    | 3.7-3.10 | Support contract required |
-+--------------+---------+----------+---------------------------+
++--------------+---------+-----------+---------------------------+
+| CRX version  | Wagtail | Python    | Support Status            |
++==============+=========+===========+===========================+
+| CRX 6.0      | 7.0-7.1 | 3.10-3.13 | Supported                 |
++--------------+---------+-----------+---------------------------+
+| CRX 5.0      | 6.3-6.4 | 3.9-3.13  | Supported                 |
++--------------+---------+-----------+---------------------------+
+| CRX 4.1      | 6.3     | 3.9-3.13  | Supported                 |
++--------------+---------+-----------+---------------------------+
+| CRX 4.0      | 6.0-6.2 | 3.8-3.12  | Support contract required |
++--------------+---------+-----------+---------------------------+
+| CRX 3.x      | 5.x     | 3.8-3.12  | Support contract required |
++--------------+---------+-----------+---------------------------+
+| CRX 2.x      | 4.x     | 3.7-3.11  | Support contract required |
++--------------+---------+-----------+---------------------------+
+| CRX 1.x      | 3.x     | 3.7-3.11  | Support contract required |
++--------------+---------+-----------+---------------------------+
+| CRX 0.25     | 2.16    | 3.7-3.10  | Support contract required |
++--------------+---------+-----------+---------------------------+
 
 .. toctree::
     :maxdepth: 1
 
+    v6.0.0
     v5.0.2
     v5.0.1
     v5.0.0

docs/releases/v6.0.0.rst

@@ -0,0 +1,26 @@
+v6.0.0 release notes
+====================
+
+
+New features
+------------
+
+* Support Wagtail 7.0 LTS and 7.1.
+
+* Support Django 5.2 LTS.
+
+* Support Python 3.10 to 3.13.
+
+
+Upgrade considerations
+----------------------
+
+Dropped support for Python 3.9 which is reaching end of life soon.
+
+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>`_.
+
+
+Thank you!
+----------
+
+Thanks to everyone who contributed to `6.0.0 on GitHub <https://github.com/coderedcorp/coderedcms/milestone/64?closed=1>`_.

pyproject.toml

@@ -1,7 +1,7 @@
 # -- PACKAGE --------------------------
 
 [build-system]
-requires = ["setuptools>=65.5"]
+requires = ["setuptools>=78.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -15,7 +15,6 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -25,30 +24,31 @@ classifiers = [
     "Framework :: Django :: 4.2",
     "Framework :: Django :: 5.0",
     "Framework :: Django :: 5.1",
+    "Framework :: Django :: 5.2",
     "Framework :: Wagtail",
-    "Framework :: Wagtail :: 6",
+    "Framework :: Wagtail :: 7",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
     "Topic :: Internet :: WWW/HTTP :: Site Management",
 ]
 dependencies = [
-    "beautifulsoup4>=4.8,<4.13",  # should be the same as wagtail
+    "beautifulsoup4>=4.8,<5",  # should be the same as wagtail
     "django-eventtools==1.0.*",
-    "django-bootstrap5==24.3",
+    "django-bootstrap5==25.2",
     "Django>=4.2,<6.0",  # should be the same as wagtail
     "geocoder==1.38.*",
-    "icalendar==6.1.*",
-    "wagtail>=6.3,<7.0",
-    "wagtail-cache>=2.4,<3",
-    "wagtail-flexible-forms==2.*",
-    "wagtail-seo==3.*",
+    "icalendar==6.3.*",
+    "wagtail>=7.0,<8.0",
+    "wagtail-cache==3.*",
+    "wagtail-flexible-forms>=2.1,<3.0",
+    "wagtail-seo>=3.1,<4.0",
 ]
 description = "Wagtail + CodeRed Extensions enabling rapid development of marketing-focused websites."
 dynamic = ["version"]
 license = {file = "LICENSE.txt"}
 name = "coderedcms"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 [project.scripts]
 coderedcms = "coderedcms.bin.coderedcms:main"

requirements-dev.txt

@@ -5,5 +5,5 @@
 build
 jsmin
 libsass
-setuptools>=65.5
+setuptools>=78.0
 twine