Resolve deprecation warnings (#81)

* Resolve deprecation warnings

Squash deprecation warnings that want to bite us in 5.0

* sort imports to appease the linter

home/migrations/0003_auto_20210110_0738.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.4 on 2021-01-10 07:38
 
 import django.db.models.deletion
-import wagtail.core.fields
+import wagtail.fields
 from django.db import migrations, models
 
 
@@ -27,11 +27,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="homepage",
             name="intro_content",
-            field=wagtail.core.fields.RichTextField(blank=True),
+            field=wagtail.fields.RichTextField(blank=True),
         ),
         migrations.AddField(
             model_name="homepage",
             name="intro_title",
-            field=wagtail.core.fields.RichTextField(blank=True),
+            field=wagtail.fields.RichTextField(blank=True),
         ),
     ]

home/migrations/0005_simplepage.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.4 on 2021-01-10 10:12
 
 import django.db.models.deletion
-import wagtail.core.fields
+import wagtail.fields
 from django.db import migrations, models
 
 
@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
                         to="wagtailcore.page",
                     ),
                 ),
-                ("content", wagtail.core.fields.RichTextField(blank=True)),
+                ("content", wagtail.fields.RichTextField(blank=True)),
             ],
             options={
                 "abstract": False,

home/models.py

@@ -1,7 +1,7 @@
 from django.db import models
-from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel
-from wagtail.core.fields import RichTextField
-from wagtail.core.models import Page
+from wagtail.admin.panels import FieldPanel, MultiFieldPanel
+from wagtail.fields import RichTextField
+from wagtail.models import Page
 from wagtail.snippets.models import register_snippet
 
 

home/templatetags/menu_tags.py

@@ -1,5 +1,5 @@
 from django import template
-from wagtail.core.models import Page
+from wagtail.models import Page
 
 
 register = template.Library()

news/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.4 on 2021-01-10 09:46
 
 import django.db.models.deletion
-import wagtail.core.fields
+import wagtail.fields
 from django.db import migrations, models
 
 
@@ -28,8 +28,8 @@ class Migration(migrations.Migration):
                         to="wagtailcore.page",
                     ),
                 ),
-                ("content", wagtail.core.fields.RichTextField()),
-                ("teaser", wagtail.core.fields.RichTextField(blank=True)),
+                ("content", wagtail.fields.RichTextField()),
+                ("teaser", wagtail.fields.RichTextField(blank=True)),
                 ("date", models.DateField()),
             ],
             options={

news/models.py

@@ -1,7 +1,7 @@
 from django.db import models
-from wagtail.admin.edit_handlers import FieldPanel
-from wagtail.core.fields import RichTextField
-from wagtail.core.models import Page
+from wagtail.admin.panels import FieldPanel
+from wagtail.fields import RichTextField
+from wagtail.models import Page
 
 
 class NewsList(Page):

program/migrations/0001_initial.py

@@ -2,7 +2,7 @@
 
 import django.db.models.deletion
 import modelcluster.fields
-import wagtail.core.fields
+import wagtail.fields
 from django.db import migrations, models
 
 
@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
                         to="wagtailcore.page",
                     ),
                 ),
-                ("abstract", wagtail.core.fields.RichTextField(blank=True)),
+                ("abstract", wagtail.fields.RichTextField(blank=True)),
                 ("slides", models.URLField(blank=True, null=True)),
                 ("video", models.URLField(blank=True, null=True)),
                 ("start_time", models.DateTimeField(blank=True, null=True)),
@@ -81,7 +81,7 @@ class Migration(migrations.Migration):
                 ("company", models.CharField(blank=True, max_length=200)),
                 ("twitter_handle", models.CharField(blank=True, max_length=200)),
                 ("website", models.URLField(blank=True)),
-                ("bio", wagtail.core.fields.RichTextField(blank=True)),
+                ("bio", wagtail.fields.RichTextField(blank=True)),
                 (
                     "headshot",
                     models.ForeignKey(

program/models.py

@@ -2,9 +2,9 @@
 
 from django.db import models
 from modelcluster.fields import ParentalKey
-from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, MultiFieldPanel
-from wagtail.core.fields import RichTextField
-from wagtail.core.models import Orderable, Page
+from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel
+from wagtail.fields import RichTextField
+from wagtail.models import Orderable, Page
 from wagtail.snippets.models import register_snippet
 
 

pycascades/deployment/models.py

@@ -6,7 +6,7 @@
 from django.db import connection, models
 from django.db.models import signals
 from pynetlify import pynetlify
-from wagtail.admin.edit_handlers import FieldPanel
+from wagtail.admin.panels import FieldPanel
 
 
 class NetlifyConfiguration(models.Model):

pycascades/jobs/migrations/0002_job.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.5 on 2021-01-17 03:35
 
 import django.db.models.deletion
-import wagtail.core.fields
+import wagtail.fields
 from django.db import migrations, models
 
 
@@ -27,8 +27,8 @@ class Migration(migrations.Migration):
                         to="wagtailcore.page",
                     ),
                 ),
-                ("location", wagtail.core.fields.RichTextField(blank=True)),
-                ("description", wagtail.core.fields.RichTextField(blank=True)),
+                ("location", wagtail.fields.RichTextField(blank=True)),
+                ("description", wagtail.fields.RichTextField(blank=True)),
                 ("post_url", models.CharField(blank=True, max_length=2000)),
                 ("apply_url", models.CharField(blank=True, max_length=2000)),
             ],

pycascades/jobs/migrations/0005_auto_20210117_0356.py

@@ -1,6 +1,6 @@
 # Generated by Django 3.1.5 on 2021-01-17 03:56
 
-import wagtail.core.fields
+import wagtail.fields
 from django.db import migrations
 
 
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="job",
             name="location",
-            field=wagtail.core.fields.RichTextField(blank=True),
+            field=wagtail.fields.RichTextField(blank=True),
         ),
         migrations.DeleteModel(
             name="Location",

pycascades/jobs/models.py

@@ -1,8 +1,8 @@
 from django.db import models
 from django.template.defaultfilters import slugify
-from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel
-from wagtail.core.fields import RichTextField
-from wagtail.core.models import Page
+from wagtail.admin.panels import FieldPanel, MultiFieldPanel
+from wagtail.fields import RichTextField
+from wagtail.models import Page
 
 
 class JobOverview(Page):

pycascades/settings/base.py

@@ -38,7 +38,7 @@
     "wagtail.images",
     "wagtail.search",
     "wagtail.admin",
-    "wagtail.core",
+    "wagtail",
     "wagtail.contrib.modeladmin",
     "bakery",
     "wagtailbakery",

pycascades/urls.py

@@ -1,8 +1,8 @@
 from django.conf import settings
 from django.contrib import admin
 from django.urls import include, path
+from wagtail import urls as wagtail_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
 
 from search import views as search_views

search/views.py

@@ -1,6 +1,6 @@
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.template.response import TemplateResponse
-from wagtail.core.models import Page
+from wagtail.models import Page
 from wagtail.search.models import Query
 
 

sponsors/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.4 on 2021-01-10 08:36
 
 import django.db.models.deletion
-import wagtail.core.fields
+import wagtail.fields
 from django.db import migrations, models
 
 
@@ -54,7 +54,7 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=255)),
                 ("website", models.URLField(blank=True)),
-                ("description", wagtail.core.fields.RichTextField(blank=True)),
+                ("description", wagtail.fields.RichTextField(blank=True)),
                 ("sign_date", models.DateField()),
                 (
                     "logo",

sponsors/models.py

@@ -1,6 +1,6 @@
 from django.db import models
-from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel
-from wagtail.core.fields import RichTextField
+from wagtail.admin.panels import FieldPanel, MultiFieldPanel
+from wagtail.fields import RichTextField
 from wagtail.snippets.models import register_snippet
 
 

team/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.4 on 2021-01-10 11:48
 
 import django.db.models.deletion
-import wagtail.core.fields
+import wagtail.fields
 from django.db import migrations, models
 
 
@@ -29,7 +29,7 @@ class Migration(migrations.Migration):
                         to="wagtailcore.page",
                     ),
                 ),
-                ("description", wagtail.core.fields.RichTextField()),
+                ("description", wagtail.fields.RichTextField()),
             ],
             options={
                 "abstract": False,
@@ -50,7 +50,7 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=255)),
                 ("title", models.CharField(blank=True, max_length=255)),
-                ("bio", wagtail.core.fields.RichTextField(blank=True)),
+                ("bio", wagtail.fields.RichTextField(blank=True)),
                 ("email", models.EmailField(blank=True, max_length=254)),
                 ("twitter", models.CharField(blank=True, max_length=255)),
                 (

team/models.py

@@ -1,8 +1,8 @@
 from django.db import models
 from django.db.models.fields import EmailField
-from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel
-from wagtail.core.fields import RichTextField
-from wagtail.core.models import Page
+from wagtail.admin.panels import FieldPanel, MultiFieldPanel
+from wagtail.fields import RichTextField
+from wagtail.models import Page
 from wagtail.snippets.models import register_snippet