Add support for Wagtail 2 and drop support for older versions of Wagtail

setup.py

@@ -6,15 +6,15 @@
 
 test_requires = [
     'freezegun==0.3.9',
-    'wagtail==1.13',
+    'wagtail>=2.0,<2.1',
     'pytest==3.2.3',
     'pytest-django==3.1.2',
     'pytest-xdist==1.20.1',
 ]
 
 setup(
     name='regulus-wagtail-extensions',
-    version='1.0.2',
+    version='2.0.0',
     packages=find_packages(),
     include_package_data=True,
     license='MIT License',
@@ -24,6 +24,7 @@
     author_email='reg@regulusweb.com',
     python_requires='>=3.4',
     install_requires=[
+        'wagtail>=2.0'
         'django-phonenumber-field',
         'dateutils',
         'wagtailgeowidget',

tests/test_blocks.py

@@ -6,7 +6,7 @@
 from freezegun import freeze_time
 from phonenumber_field.phonenumber import PhoneNumber
 
-from wagtail.wagtailcore.models import Page
+from wagtail.core.models import Page
 from wagtail_extensions.blocks import (DepartmentBlock, LinkBlock,
                                        OpeningTimeBlock, OpeningTimesBlock,
                                        PhoneBlock)

tests/test_models.py

@@ -2,7 +2,7 @@
 
 from freezegun import freeze_time
 import pytest
-from wagtail.wagtailcore.models import Site
+from wagtail.core.models import Site
 
 from tests.testproject.testapp.models import ContactDetailsTestSetting
 

tests/testproject/testproject/settings/base.py

@@ -29,17 +29,16 @@
     'wagtail_extensions',
     'tests.testproject.testapp.apps.TestAppConfig',
 
-    'wagtail.wagtailforms',
-    'wagtail.wagtailredirects',
-    'wagtail.wagtailembeds',
-    'wagtail.wagtailsites',
-    'wagtail.wagtailusers',
-    'wagtail.wagtailsnippets',
-    'wagtail.wagtaildocs',
-    'wagtail.wagtailimages',
-    'wagtail.wagtailsearch',
-    'wagtail.wagtailadmin',
-    'wagtail.wagtailcore',
+    # 'wagtail.redirects',
+    'wagtail.embeds',
+    'wagtail.sites',
+    'wagtail.users',
+    'wagtail.snippets',
+    'wagtail.documents',
+    'wagtail.images',
+    'wagtail.search',
+    'wagtail.admin',
+    'wagtail.core',
 
     'modelcluster',
     'taggit',
@@ -61,8 +60,7 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
 
-    'wagtail.wagtailcore.middleware.SiteMiddleware',
-    'wagtail.wagtailredirects.middleware.RedirectMiddleware',
+    'wagtail.core.middleware.SiteMiddleware',
 ]
 
 ROOT_URLCONF = 'testproject.testproject.urls'

tests/testproject/testproject/urls.py

@@ -1,15 +1,13 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib import admin
 
-from wagtail.wagtailadmin import urls as wagtailadmin_urls
-from wagtail.wagtailcore import urls as wagtail_urls
-from wagtail.wagtaildocs import urls as wagtaildocs_urls
+from wagtail.admin import urls as wagtailadmin_urls
+from wagtail.core import urls as wagtail_urls
+from wagtail.documents import urls as wagtaildocs_urls
 
 urlpatterns = [
-    url(r'^django-admin/', include(admin.site.urls)),
+    url(r'^django-admin/', admin.site.urls),
 
     url(r'^admin/', include(wagtailadmin_urls)),
     url(r'^documents/', include(wagtaildocs_urls)),

wagtail_extensions/blocks.py

@@ -13,9 +13,9 @@
 from django.utils.timezone import now
 from phonenumber_field import phonenumber
 from phonenumber_field.formfields import PhoneNumberField
-from wagtail.wagtailcore import blocks
-from wagtail.wagtaildocs.blocks import DocumentChooserBlock
-from wagtail.wagtailimages.blocks import ImageChooserBlock
+from wagtail.core import blocks
+from wagtail.documents.blocks import DocumentChooserBlock
+from wagtail.images.blocks import ImageChooserBlock
 from wagtailgeowidget.blocks import GeoBlock
 
 from . import app_settings

wagtail_extensions/mixins.py

@@ -4,8 +4,8 @@
 from django.utils.decorators import method_decorator
 
 from honeypot.decorators import check_honeypot
-from wagtail.wagtailadmin.edit_handlers import FieldPanel
-from wagtail.wagtailcore.models import Page
+from wagtail.admin.edit_handlers import FieldPanel
+from wagtail.core.models import Page
 
 from .forms import ContactForm
 

wagtail_extensions/models.py

@@ -3,10 +3,10 @@
 
 from wagtail.contrib.settings.models import BaseSetting
 from wagtail.contrib.table_block.blocks import TableBlock
-from wagtail.wagtailadmin.edit_handlers import StreamFieldPanel
-from wagtail.wagtailcore import blocks, fields
-from wagtail.wagtailcore.models import Page
-from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+from wagtail.admin.edit_handlers import StreamFieldPanel
+from wagtail.core import blocks, fields
+from wagtail.core.models import Page
+from wagtail.images.edit_handlers import ImageChooserPanel
 
 from . import blocks as extension_blocks
 from . import utils