Drop pre Wagtail 2.15 support

.github/workflows/test.yml

@@ -33,22 +33,13 @@ jobs:
     strategy:
       matrix:
         python: ['3.7', '3.8', '3.9']
-        django: ['2.2']
-        wagtail: ['2.11', '2.12', '2.13']
+        django: ['3.2']
+        wagtail: ['2.15', '2.16', '3.0', '4.0']
         include:
-          # Add test for Django 3.2 that is only suported on Wagtail 2.13+
           - python: '3.9'
-            django: '3.2'
-            wagtail: '2.15'
-          - python: '3.9'
-            django: '3.2'
-            wagtail: '2.16'
-          - python: '3.9'
-            django: '3.2'
-            wagtail: '3.0'
-          - python: '3.9'
-            django: '3.2'
+            django: '4.1'
             wagtail: '4.0'
+            experimental: false
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python }}
@@ -77,31 +68,14 @@ jobs:
     strategy:
       matrix:
         python: ['3.7', '3.8', '3.9']
-        django: ['2.2']
-        wagtail: ['2.11', '2.12', '2.13']
+        django: ['3.2']
+        wagtail: ['2.15', '2.16', '3.0']
         experimental: [false]
         include:
-          # Add test for Django 3.2 that is only suported on Wagtail 2.13+
-          - python: '3.9'
-            django: '3.2'
-            wagtail: '2.14'
-            experimental: false
-          - python: '3.9'
-            django: '3.2'
-            wagtail: '2.15'
-            experimental: false
-          - python: '3.9'
-            django: '3.2'
-            wagtail: '2.16'
-            experimental: false
           - python: '3.9'
             django: '4.0'
             wagtail: '2.16'
             experimental: false
-          - python: '3.9'
-            django: '3.2'
-            wagtail: '3.0'
-            experimental: false
           - python: '3.9'
             django: '4.0'
             wagtail: '3.0'

README.md

@@ -19,8 +19,8 @@ Wagtail Localize is a translation plugin for the [Wagtail CMS](https://wagtail.o
 Wagtail Localize requires the following:
 
 - Python (3.7, 3.8, 3.9, 3.10)
-- Django (2.2, 3.0, 3.1, 3.2, 4.0, 4.1)
-- Wagtail (2.11, 2.12, 2.13, 2.14, 2.15, 2.16, 3.0, 4.0) with [internationalisation enabled](https://docs.wagtail.org/en/stable/advanced_topics/i18n.html#configuration)
+- Django (3.2, 4.0, 4.1)
+- Wagtail (2.15, 2.16, 3.0, 4.0) with [internationalisation enabled](https://docs.wagtail.org/en/stable/advanced_topics/i18n.html#configuration)
 
 ## Installation
 

pyproject.toml

@@ -31,8 +31,8 @@ classifiers = [
 dynamic = ["version"]
 requires-python = ">=3.7"
 dependencies = [
-    "Django>=2.2,<4.2",
-    "Wagtail>=2.11,<5.0",
+    "Django>=3.2,<4.2",
+    "Wagtail>=2.15,<5.0",
     "polib>=1.1,<2.0",
     "typing_extensions>=4.0"
 ]

tox.ini

@@ -3,10 +3,9 @@ skipsdist = True
 usedevelop = True
 
 envlist =
-    python{3.7,3.8,3.9}-django{2.2}-wagtail{2.11,2.12,2.13}-{sqlite,postgres}
-    python{3.7,3.8,3.9}-django{3.2}-wagtail{2.14,2.15,2.16,3.0,4.0}-{sqlite,postgres}
-    python{3.7,3.8,3.9,3.10}-django{4.0}-wagtail{2.16,3.0,4.0,main}-{sqlite,postgres}
+    python{3.7,3.8,3.9}-django{3.2}-wagtail{2.15,2.16,3.0,4.0}-{sqlite,postgres}
     python{3.10}-django{3.2}-wagtail{2.15,2.16,3.0,4.0,main}-{sqlite,postgres}
+    python{3.7,3.8,3.9,3.10}-django{4.0}-wagtail{2.16,3.0,4.0,main}-{sqlite,postgres}
     python{3.8, 3.9, 3.10}-django{4.1,main}-wagtail{4.0,main}-{sqlite,postgres}
 
 [flake8]
@@ -29,16 +28,11 @@ deps =
     coverage
     typing_extensions>=4.0
 
-    django2.2: Django~=2.2
     django3.2: Django~=3.2
     django4.0: Django~=4.0
     django4.1: Django~=4.1
     djangomain: git+https://github.com/django/django.git@main#egg=Django
 
-    wagtail2.11: wagtail>=2.11,<2.12
-    wagtail2.12: wagtail>=2.12,<2.13
-    wagtail2.13: wagtail>=2.13,<2.14
-    wagtail2.14: wagtail>=2.14,<2.15
     wagtail2.15: wagtail>=2.15,<2.16
     wagtail2.16: wagtail>=2.16,<2.17
     wagtail3.0: wagtail>=3.0,<4.0

wagtail_localize/__init__.py

@@ -1,10 +1,7 @@
-from django import VERSION as DJANGO_VERSION
+from .version import get_version
 
-from .version import VERSION, __version__  # noqa
 
+# release must be one of alpha, beta, rc, or final
+VERSION = (1, 3, 0, "alpha", 3)
 
-if DJANGO_VERSION >= (3, 2):
-    # The declaration is only needed for older Django versions
-    pass
-else:
-    default_app_config = "wagtail_localize.apps.WagtailLocalizeAppConfig"
+__version__ = get_version(VERSION)

wagtail_localize/locales/__init__.py

@@ -1,8 +0,0 @@
-from django import VERSION as DJANGO_VERSION
-
-
-if DJANGO_VERSION >= (3, 2):
-    # The declaration is only needed for older Django versions
-    pass
-else:
-    default_app_config = "wagtail_localize.locales.apps.WagtailLocalesAppConfig"

wagtail_localize/modeladmin/__init__.py

@@ -1,10 +0,0 @@
-from django import VERSION as DJANGO_VERSION
-
-
-if DJANGO_VERSION >= (3, 2):
-    # The declaration is only needed for older Django versions
-    pass
-else:
-    default_app_config = (
-        "wagtail_localize.modeladmin.apps.WagtailLocalizeModelAdminAppConfig"
-    )

wagtail_localize/modeladmin/templates/wagtail_localize/modeladmin/translatable_edit.html

@@ -2,11 +2,7 @@
 {% load i18n wagtailadmin_tags %}
 
 {% block header %}
-  {% if wagtail_version >= "2.15" %}
     {% include "modeladmin/includes/header_with_history.html" with title=view.get_page_title subtitle=view.get_page_subtitle icon=view.header_icon tabbed=1 merged=1 latest_log_entry=latest_log_entry history_url=history_url %}
-  {% else %}
-    {% include "wagtailadmin/shared/header_with_locale_selector.html" with title=view.get_page_title subtitle=view.get_page_subtitle icon=view.header_icon tabbed=1 merged=1 %}
-  {% endif %}
 {% endblock %}
 
 {% block form_actions %}

wagtail_localize/modeladmin/views.py

@@ -8,12 +8,12 @@
 from django.urls import NoReverseMatch, reverse
 from django.utils.decorators import method_decorator
 from django.utils.translation import gettext as _
-from wagtail import VERSION as WAGTAIL_VERSION
 from wagtail.contrib.modeladmin.views import (
     ChooseParentView,
     CreateView,
     DeleteView,
     EditView,
+    HistoryView,
     IndexView,
     InspectView,
 )
@@ -25,12 +25,6 @@
 from wagtail_localize.views.submit_translations import SubmitTranslationView
 
 
-if WAGTAIL_VERSION >= (2, 15):
-    from wagtail.contrib.modeladmin.views import HistoryView
-else:
-    HistoryView = object
-
-
 class TranslatableViewMixin:
     def __init__(self, *args, **kwargs):
         self.locale = None

wagtail_localize/models.py

@@ -527,7 +527,7 @@ def as_instance(self):
 
         if isinstance(instance, Page):
             content_json = self.content_json
-            if WAGTAIL_VERSION >= (2, 17):
+            if WAGTAIL_VERSION >= (3, 0):
                 # see https://github.com/wagtail/wagtail/pull/8024
                 content_json = json.loads(content_json)
             return instance.with_content_json(content_json)

wagtail_localize/segments/tests/test_segment_ingestion.py

@@ -18,16 +18,6 @@
 from wagtail_localize.test.models import TestChildObject, TestPage, TestSnippet
 
 
-def streamfield_raw_data(stream_data):
-    """
-    Extracts raw_data from streamfields. The attribute for doing this changed in Wagtail 2.12
-    """
-    if WAGTAIL_VERSION >= (2, 12):
-        return stream_data.raw_data
-    else:
-        return stream_data.stream_data
-
-
 def make_test_page(**kwargs):
     root_page = Page.objects.get(id=1)
     kwargs.setdefault("title", "Test page")
@@ -287,7 +277,7 @@ def test_charblock(self):
         translated_page.refresh_from_db()
 
         self.assertEqual(
-            list(streamfield_raw_data(translated_page.test_streamfield)),
+            list(translated_page.test_streamfield.raw_data),
             [
                 {
                     "id": str(block_id),
@@ -317,7 +307,7 @@ def test_textblock(self):
         translated_page.refresh_from_db()
 
         self.assertEqual(
-            list(streamfield_raw_data(translated_page.test_streamfield)),
+            list(translated_page.test_streamfield.raw_data),
             [
                 {
                     "id": str(block_id),
@@ -347,7 +337,7 @@ def test_emailblock(self):
         translated_page.refresh_from_db()
 
         self.assertEqual(
-            list(streamfield_raw_data(translated_page.test_streamfield)),
+            list(translated_page.test_streamfield.raw_data),
             [
                 {
                     "id": str(block_id),
@@ -381,7 +371,7 @@ def test_urlblock(self):
         translated_page.refresh_from_db()
 
         self.assertEqual(
-            list(streamfield_raw_data(translated_page.test_streamfield)),
+            list(translated_page.test_streamfield.raw_data),
             [
                 {
                     "id": str(block_id),
@@ -418,7 +408,7 @@ def test_embedblock(self):
         translated_page.refresh_from_db()
 
         self.assertEqual(
-            list(streamfield_raw_data(translated_page.test_streamfield)),
+            list(translated_page.test_streamfield.raw_data),
             [
                 {
                     "id": str(block_id),
@@ -451,7 +441,7 @@ def test_richtextblock(self):
         translated_page.refresh_from_db()
 
         self.assertEqual(
-            list(streamfield_raw_data(translated_page.test_streamfield)),
+            list(translated_page.test_streamfield.raw_data),
             [
                 {
                     "id": str(block_id),
@@ -485,7 +475,7 @@ def test_rawhtmlblock(self):
         translated_page.refresh_from_db()
 
         self.assertEqual(
-            list(streamfield_raw_data(translated_page.test_streamfield)),
+            list(translated_page.test_streamfield.raw_data),
             [
                 {
                     "id": str(block_id),
@@ -515,7 +505,7 @@ def test_blockquoteblock(self):
         translated_page.refresh_from_db()
 
         self.assertEqual(
-            list(streamfield_raw_data(translated_page.test_streamfield)),
+            list(translated_page.test_streamfield.raw_data),
             [
                 {
                     "id": str(block_id),
@@ -554,7 +544,7 @@ def test_structblock(self):
         translated_page.refresh_from_db()
 
         self.assertEqual(
-            list(streamfield_raw_data(translated_page.test_streamfield)),
+            list(translated_page.test_streamfield.raw_data),
             [
                 {
                     "id": str(block_id),
@@ -598,7 +588,7 @@ def test_listblock(self):
         translated_page.refresh_from_db()
 
         self.assertEqual(
-            list(streamfield_raw_data(translated_page.test_streamfield)),
+            list(translated_page.test_streamfield.raw_data),
             [
                 {
                     "id": str(block_id),
@@ -647,7 +637,7 @@ def test_nestedstreamblock(self):
         translated_page.refresh_from_db()
 
         self.assertEqual(
-            list(streamfield_raw_data(translated_page.test_streamfield)),
+            list(translated_page.test_streamfield.raw_data),
             [
                 {
                     "id": str(block_id),
@@ -690,7 +680,7 @@ def test_customstructblock(self):
         translated_page.refresh_from_db()
 
         self.assertEqual(
-            list(streamfield_raw_data(translated_page.test_streamfield)),
+            list(translated_page.test_streamfield.raw_data),
             [
                 {
                     "id": str(block_id),

wagtail_localize/static_src/editor/components/TranslationEditor/footer.tsx

@@ -140,33 +140,19 @@ const EditorFooter: FunctionComponent<EditorProps> = ({
     // Make last action the default
     const defaultAction = actions.pop();
 
-    // The markup for footers is slightly different when running Wagtail 2.13+
-    if ((window as any).comments) {
-        // Running Wagtail 2.13
-        return (
-            <footer className="footer">
-                <ul>
-                    <li className="footer__container">
-                        <ActionMenu
-                            defaultAction={defaultAction}
-                            actions={actions}
-                            previewModes={previewModes}
-                        />
-                    </li>
-                </ul>
-            </footer>
-        );
-    } else {
-        return (
-            <footer>
-                <ActionMenu
-                    defaultAction={defaultAction}
-                    actions={actions}
-                    previewModes={previewModes}
-                />
-            </footer>
-        );
-    }
+    return (
+        <footer className="footer">
+            <ul>
+                <li className="footer__container">
+                    <ActionMenu
+                        defaultAction={defaultAction}
+                        actions={actions}
+                        previewModes={previewModes}
+                    />
+                </li>
+            </ul>
+        </footer>
+    );
 };
 
 export default EditorFooter;