Dropped support and tests for Wagtail before 4.1, removed conditional…

… code

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Compatibility with Python 3.11 and Wagtail 4.2. [#79](https://github.com/wagtail/wagtail-bakery/pull/79)
 
+### Removed
+
+- Drop support for Wagtail before 4.1 [#79](https://github.com/wagtail/wagtail-bakery/pull/79)
+
 ## [0.6.0](https://github.com/wagtail/wagtail-bakery/compare/0.5.0...0.6.0)
 
 ### Added

README.md

@@ -26,7 +26,7 @@ Wagtail-bakery is built on top of [Django bakery](https://github.com/datadesk/dj
 
 - Python 3.8 - 3.11
 - Django 3.2 - 4.1
-- Wagtail 2.15 - 4.2
+- Wagtail >= 4.1
 
 We aim to support the Wagtail versions as [supported](http://docs.wagtail.io/en/latest/releases/upgrading.html) by Wagtail (current LTS, current stable).
 

examples/aws/example/migrations/0001_initial.py

@@ -1,14 +1,8 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.3 on 2016-11-22 14:31
 import django.db.models.deletion
-from wagtail import VERSION as WAGTAIL_VERSION
-
-if WAGTAIL_VERSION >= (3, 0):
-    from wagtail import blocks, fields
-else:
-    from wagtail.core import blocks, fields
-
 from django.db import migrations, models
+from wagtail import blocks, fields
 
 
 class Migration(migrations.Migration):
@@ -19,7 +13,7 @@ class Migration(migrations.Migration):
         ('wagtailcore', '0030_index_on_pagerevision_created_at'),
     ]
 
-    streamfield_params = {"use_json_field": True} if WAGTAIL_VERSION >= (3, 0) else {}
+    streamfield_params = {"use_json_field": True}
 
     operations = [
         migrations.CreateModel(

examples/aws/example/models.py

@@ -1,16 +1,8 @@
-from wagtail import VERSION as WAGTAIL_VERSION
-
-if WAGTAIL_VERSION >= (3, 0):
-    from wagtail import blocks
-    from wagtail.admin.panels import FieldPanel
-    from wagtail.admin.panels import FieldPanel as StreamFieldPanel
-    from wagtail.fields import StreamField
-    from wagtail.models import Page
-else:
-    from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel
-    from wagtail.core import blocks
-    from wagtail.core.fields import StreamField
-    from wagtail.core.models import Page
+from wagtail import blocks
+from wagtail.admin.panels import FieldPanel
+from wagtail.admin.panels import FieldPanel as StreamFieldPanel
+from wagtail.fields import StreamField
+from wagtail.models import Page
 
 from wagtailbakery.models import AutoPublishingWagtailBakeryModel
 

examples/aws/example/settings.py

@@ -13,7 +13,6 @@
 import os
 
 import environ
-from wagtail import VERSION as WAGTAIL_VERSION
 
 env = environ.Env()
 
@@ -53,7 +52,7 @@
     'wagtail.images',
     'wagtail.search',
     'wagtail.admin',
-    'wagtail' if WAGTAIL_VERSION >= (3, 0) else 'wagtail.core',
+    'wagtail',
 
     'wagtail.contrib.settings',
 

examples/aws/example/urls.py

@@ -18,14 +18,8 @@
 from django.conf import settings
 from django.contrib import admin
 from django.urls import include, path
-from wagtail import VERSION as WAGTAIL_VERSION
+from wagtail import urls as wagtail_urls
 from wagtail.admin import urls as wagtailadmin_urls
-
-if WAGTAIL_VERSION >= (3, 0):
-    from wagtail import urls as wagtail_urls
-else:
-    from wagtail.core import urls as wagtail_urls
-
 from wagtail.documents import urls as wagtaildocs_urls
 
 urlpatterns = [

examples/multisite/example/migrations/0001_initial.py

@@ -1,14 +1,8 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.3 on 2016-11-22 14:31
 import django.db.models.deletion
-from wagtail import VERSION as WAGTAIL_VERSION
-
-if WAGTAIL_VERSION >= (3, 0):
-    from wagtail import blocks, fields
-else:
-    from wagtail.core import blocks, fields
-
 from django.db import migrations, models
+from wagtail import blocks, fields
 
 
 class Migration(migrations.Migration):
@@ -19,7 +13,7 @@ class Migration(migrations.Migration):
         ('wagtailcore', '0030_index_on_pagerevision_created_at'),
     ]
 
-    streamfield_params = {"use_json_field": True} if WAGTAIL_VERSION >= (3, 0) else {}
+    streamfield_params = {"use_json_field": True}
 
     operations = [
         migrations.CreateModel(

examples/multisite/example/models.py

@@ -1,16 +1,8 @@
-from wagtail import VERSION as WAGTAIL_VERSION
-
-if WAGTAIL_VERSION >= (3, 0):
-    from wagtail import blocks
-    from wagtail.admin.panels import FieldPanel
-    from wagtail.admin.panels import FieldPanel as StreamFieldPanel
-    from wagtail.fields import StreamField
-    from wagtail.models import Page
-else:
-    from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel
-    from wagtail.core import blocks
-    from wagtail.core.fields import StreamField
-    from wagtail.core.models import Page
+from wagtail import blocks
+from wagtail.admin.panels import FieldPanel
+from wagtail.admin.panels import FieldPanel as StreamFieldPanel
+from wagtail.fields import StreamField
+from wagtail.models import Page
 
 
 class AbstractExamplePage(Page):

examples/multisite/example/settings.py

@@ -12,8 +12,6 @@
 
 import os
 
-from wagtail import VERSION as WAGTAIL_VERSION
-
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
@@ -50,7 +48,7 @@
     'wagtail.images',
     'wagtail.search',
     'wagtail.admin',
-    'wagtail' if WAGTAIL_VERSION >= (3, 0) else 'wagtail.core',
+    'wagtail',
 
     'wagtail.contrib.settings',
 

examples/multisite/example/urls.py

@@ -18,14 +18,8 @@
 from django.conf import settings
 from django.contrib import admin
 from django.urls import include, path
-from wagtail import VERSION as WAGTAIL_VERSION
+from wagtail import urls as wagtail_urls
 from wagtail.admin import urls as wagtailadmin_urls
-
-if WAGTAIL_VERSION >= (3, 0):
-    from wagtail import urls as wagtail_urls
-else:
-    from wagtail.core import urls as wagtail_urls
-
 from wagtail.documents import urls as wagtaildocs_urls
 
 urlpatterns = [

setup.py

@@ -5,7 +5,7 @@
 
 install_requires = [
     'django-bakery~=0.13.1',
-    'wagtail>=2.15',
+    'wagtail>=4.1',
 ]
 
 test_requires = [
@@ -44,7 +44,6 @@
         'License :: OSI Approved :: MIT License',
         'Framework :: Django',
         'Framework :: Wagtail',
-        'Framework :: Wagtail :: 2',
         'Framework :: Wagtail :: 4',
         'Operating System :: Unix',
         'Programming Language :: Python :: 3',

src/wagtailbakery/api_views.py

@@ -5,14 +5,9 @@
 from bakery.views import BuildableMixin
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
-from wagtail import VERSION as WAGTAIL_VERSION
 from wagtail.api.v2.router import WagtailAPIRouter
 from wagtail.api.v2.views import PagesAPIViewSet
-
-if WAGTAIL_VERSION >= (3, 0):
-    from wagtail.models import Page, Site
-else:
-    from wagtail.core.models import Page, Site
+from wagtail.models import Page, Site
 
 logger = logging.getLogger(__name__)
 

src/wagtailbakery/signal_handlers.py

@@ -1,9 +1,4 @@
-from wagtail import VERSION as WAGTAIL_VERSION
-
-if WAGTAIL_VERSION >= (3, 0):
-    from wagtail.signals import page_published, page_unpublished
-else:
-    from wagtail.core.signals import page_published, page_unpublished
+from wagtail.signals import page_published, page_unpublished
 
 
 def handle_publish(sender, instance, **kwargs):

src/wagtailbakery/views.py

@@ -8,12 +8,7 @@
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from django.test.client import RequestFactory
-from wagtail import VERSION as WAGTAIL_VERSION
-
-if WAGTAIL_VERSION >= (3, 0):
-    from wagtail.models import Page, Site
-else:
-    from wagtail.core.models import Page, Site
+from wagtail.models import Page, Site
 
 logger = logging.getLogger(__name__)
 

tests/conftest.py

@@ -1,7 +1,6 @@
 import os
 
 from django.conf import settings
-from wagtail import VERSION as WAGTAIL_VERSION
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -20,17 +19,12 @@ def pytest_configure():
         'wagtail.images',
         'wagtail.search',
         'wagtail.admin',
-        'wagtail' if WAGTAIL_VERSION >= (3, 0) else 'wagtail.core',
+        'wagtail',
+    ]
+
+    wagtail_middleware = [
+        'wagtail.contrib.redirects.middleware.RedirectMiddleware',
     ]
-    if WAGTAIL_VERSION >= (2, 9):
-        wagtail_middleware = [
-            'wagtail.contrib.redirects.middleware.RedirectMiddleware',
-        ]
-    else:
-        wagtail_middleware = [
-            'wagtail.middleware.SiteMiddleware' if WAGTAIL_VERSION >= (3, 0) else 'wagtail.core.middleware.SiteMiddleware',
-            'wagtail.contrib.redirects.middleware.RedirectMiddleware',
-        ]
 
     settings.configure(
         SECRET_KEY="secret_for_testing_only",

tests/factories/page.py

@@ -1,10 +1,5 @@
 import factory
-from wagtail import VERSION as WAGTAIL_VERSION
-
-if WAGTAIL_VERSION >= (3, 0):
-    from wagtail.models import Page
-else:
-    from wagtail.core.models import Page
+from wagtail.models import Page
 
 
 class PageFactory(factory.DjangoModelFactory):

tests/factories/site.py

@@ -1,10 +1,5 @@
 import factory
-from wagtail import VERSION as WAGTAIL_VERSION
-
-if WAGTAIL_VERSION >= (3, 0):
-    from wagtail.models import Site
-else:
-    from wagtail.core.models import Site
+from wagtail.models import Site
 
 
 class SiteFactory(factory.DjangoModelFactory):

tests/fixtures.py

@@ -1,23 +1,16 @@
 import pytest
-from wagtail import VERSION as WAGTAIL_VERSION
 
 
 @pytest.fixture
 def page():
-    if WAGTAIL_VERSION >= (3, 0):
-        from wagtail.models import Page
-    else:
-        from wagtail.core.models import Page
+    from wagtail.models import Page
 
     return Page.objects.get(slug='home')
 
 
 @pytest.fixture
 def site():
-    if WAGTAIL_VERSION >= (3, 0):
-        from wagtail.models import Site
-    else:
-        from wagtail.core.models import Site
+    from wagtail.models import Site
 
     return Site.objects.get(is_default_site=True)
 

tests/integration/test_api_views.py

@@ -1,7 +1,6 @@
 import json
 
 import pytest
-from wagtail import VERSION as WAGTAIL_VERSION
 
 from wagtailbakery.api_views import (
     PagesAPIDetailView, PagesAPIListingView, TypedPagesAPIListingView)
@@ -10,12 +9,8 @@
 
 DEFAULT_PAGE_FIELDS = {'id', 'meta', 'title'}
 DEFAULT_PAGE_META_FIELDS = {'type', 'show_in_menus', 'search_description', 'first_published_at', 'slug', 'html_url', 'seo_title'}
-
-if WAGTAIL_VERSION >= (2, 11):
-    DEFAULT_PAGE_META_FIELDS.add('locale')
-
-if WAGTAIL_VERSION >= (2, 16):
-    DEFAULT_PAGE_META_FIELDS.add('alias_of')
+DEFAULT_PAGE_META_FIELDS.add('locale')
+DEFAULT_PAGE_META_FIELDS.add('alias_of')
 
 
 @pytest.mark.django_db

tests/models.py

@@ -1,11 +1,6 @@
 from django.shortcuts import redirect, render
-from wagtail import VERSION as WAGTAIL_VERSION
 from wagtail.contrib.routable_page.models import RoutablePageMixin, route
-
-if WAGTAIL_VERSION >= (3, 0):
-    from wagtail.models import Page
-else:
-    from wagtail.core.models import Page
+from wagtail.models import Page
 
 
 class RedirectPage(Page):

tests/urls.py

@@ -1,12 +1,7 @@
 from django.urls import include, path
-from wagtail import VERSION as WAGTAIL_VERSION
+from wagtail import urls as wagtail_urls
 from wagtail.admin import urls as wagtailadmin_urls
 
-if WAGTAIL_VERSION >= (3, 0):
-    from wagtail import urls as wagtail_urls
-else:
-    from wagtail.core import urls as wagtail_urls
-
 urlpatterns = [
     path('admin/', include(wagtailadmin_urls)),
     path('', include(wagtail_urls)),

tox.ini

@@ -3,20 +3,15 @@ linting_folders=src/wagtailbakery/ tests/ examples/
 
 [tox]
 envlist=
-  py310-django{32}-wagtail215,                     # Wagtail 2.15 LTS - latest supported Python - Django LTS
-  py{38,39,310}-django{32,40,41}-wagtail40,                # Wagtail 4.0 - all supported Python - all Django
-  py311-django{32,40,41}-wagtail41,                # Wagtail 4.1 LTS - latest Python - all Django
-  py311-django{32,40,41}-wagtail42,                # Wagtail 4.2 - latest Python - all Django
-  wagtailmain                                      # Wagtail main latest compatible version
+  py{38,39,310,311}-django{32,40,41}-wagtail{41,42} # Wagtail 4.1 LTS and 4.2 pre-release - all supported Python - all Django
+  wagtailmain                                       # Wagtail main latest compatible version
 
 [testenv]
 commands=py.test --cov=wagtailbakery --cov-report=xml {posargs}
 deps=
-  django32: django>=3.2,<3.3       # WT 2.15 LTS
-  django40: django>=4.0,<4.1       # WT 4.0, WT 4.1 LTS
-  django41: django>=4.1,<4.2       # WT 4.0, WT 4.1 LTS
-  wagtail215: wagtail>=2.15,<2.16  # Old LTS
-  wagtail40: wagtail>=4.0,<4.1  # Current latest
+  django32: django>=3.2,<3.3
+  django40: django>=4.0,<4.1
+  django41: django>=4.1,<4.2
   wagtail41: wagtail>=4.1rc1,<4.2  # Current LTS
   wagtail42: wagtail>=4.2rc1,<4.3
 extras=test