🐩 Upgrade Wagtail

authors/migrations/0001_initial.py

@@ -2,11 +2,11 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import wagtail.core.fields
 
+from wagtail import fields
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
@@ -17,10 +17,30 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Author',
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name='ID',
+                    ),
+                ),
                 ('name', models.CharField(help_text='Author name', max_length=100)),
-                ('bio', wagtail.core.fields.RichTextField(blank=True, help_text='Brief author bio')),
-                ('image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')),
+                (
+                    'bio',
+                    fields.RichTextField(blank=True, help_text='Brief author bio'),
+                ),
+                (
+                    'image',
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name='+',
+                        to='wagtailimages.image',
+                    ),
+                ),
             ],
         ),
     ]

authors/models.py

@@ -3,11 +3,13 @@
 from django.db import models
 from modelcluster.fields import ParentalKey
 from wagtail.admin.panels import FieldPanel, MultiFieldPanel
+from wagtail.admin.ui.tables import UpdatedAtColumn
 from wagtail.api import APIField
-from wagtail.core.fields import RichTextField
-from wagtail.core.models import Orderable
+from wagtail.fields import RichTextField
 from wagtail.images.api.fields import ImageRenditionField
+from wagtail.models import Orderable
 from wagtail.snippets.models import register_snippet
+from wagtail.snippets.views.snippets import SnippetViewSet
 
 
 class AuthorsOrderable(Orderable):
@@ -67,4 +69,17 @@ def __str__(self):
         return self.name
 
 
-register_snippet(Author)
+class AuthorAdmin(SnippetViewSet):
+    """Author admin page"""
+
+    model = Author
+    menu_label = 'Authors'
+    icon = 'group'
+    list_display = ('name', 'image', 'bio', UpdatedAtColumn())
+    add_to_settings_menu = False
+    exclude_from_explorer = False
+    search_fields = ('name', 'bio')
+    add_to_admin_menu = True
+
+
+register_snippet(Author, viewset=AuthorAdmin)

cli/utils.py

@@ -12,7 +12,7 @@ def run(cmd: str):
 def version_callback(value: bool):
     """Print the version of the program and exit"""
     if value:
-        from .ov_wag._version import __version__
+        from ov_wag._version import __version__
 
         print(f'v{__version__}')
 

codecov.yml

@@ -0,0 +1,11 @@
+coverage:
+  status:
+    project:
+      default:
+        informational: true
+    patch:
+      default:
+        informational: true
+
+comment:
+  behavior: once

exhibits/migrations/0001_initial.py

@@ -2,11 +2,10 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
@@ -17,8 +16,18 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ExhibitPage',
             fields=[
-                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
-                ('body', wagtail.core.fields.RichTextField(blank=True)),
+                (
+                    'page_ptr',
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to='wagtailcore.page',
+                    ),
+                ),
+                ('body', wagtail.fields.RichTextField(blank=True)),
             ],
             options={
                 'abstract': False,

exhibits/models.py

@@ -3,11 +3,11 @@
 from django.db import models
 from modelcluster.fields import ParentalKey
 from pydantic import BaseModel
-from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, MultiFieldPanel
+from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel
 from wagtail.api import APIField
-from wagtail.core.fields import RichTextField
-from wagtail.core.models import Orderable, Page
+from wagtail.fields import RichTextField
 from wagtail.images.api.fields import ImageRenditionField
+from wagtail.models import Orderable, Page
 from wagtail.search import index
 
 from authors.serializers import AuthorSerializer

home/migrations/0003_homepage_body.py

@@ -1,11 +1,11 @@
 # Generated by Django 3.2.9 on 2021-11-29 15:36
 
 from django.db import migrations
-import wagtail.core.fields
 
+from wagtail import fields
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ('home', '0002_create_homepage'),
     ]
@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='homepage',
             name='body',
-            field=wagtail.core.fields.RichTextField(blank=True),
+            field=fields.RichTextField(blank=True),
         ),
     ]

home/models.py

@@ -1,9 +1,9 @@
 from typing import ClassVar, List
 
-from wagtail.admin.edit_handlers import FieldPanel
+from wagtail.admin.panels import FieldPanel
 from wagtail.api import APIField
-from wagtail.core.fields import RichTextField
-from wagtail.core.models import Page
+from wagtail.fields import RichTextField
+from wagtail.models import Page
 
 
 class HomePage(Page):

ov_collections/blocks.py

@@ -1,4 +1,4 @@
-from wagtail.core.blocks import StructBlock, CharBlock, URLBlock
+from wagtail.blocks import CharBlock, StructBlock, URLBlock
 from wagtail.images.blocks import ImageChooserBlock
 
 

ov_collections/models.py

@@ -1,13 +1,13 @@
 from typing import ClassVar, List
 
 from django.db import models
-from wagtail.admin.edit_handlers import FieldPanel
+from wagtail.admin.panels import FieldPanel
 from wagtail.api import APIField
 from wagtail.blocks import CharBlock, ListBlock, RichTextBlock, TextBlock
-from wagtail.core.fields import RichTextField, StreamField
-from wagtail.core.models import Page
+from wagtail.fields import RichTextField, StreamField
 from wagtail.images.api.fields import ImageRenditionField
 from wagtail.images.blocks import ImageChooserBlock
+from wagtail.models import Page
 from wagtail.search import index
 
 from .blocks import ContentBlock, ContentImageBlock

ov_wag/_version.py

@@ -1 +1 @@
-__version__ = '0.3.0'
+__version__ = '0.4.0a0'

ov_wag/serializers.py

@@ -1,5 +1,5 @@
 from rest_framework.fields import Field
-from wagtail.core.templatetags import wagtailcore_tags
+from wagtail.templatetags import wagtailcore_tags
 
 
 class RichTextSerializer(Field):

ov_wag/settings/base.py

@@ -35,7 +35,6 @@
     'ov_collections',
     'authors',
     'wagtail.contrib.forms',
-    'wagtail.contrib.modeladmin',
     'wagtail.contrib.redirects',
     'wagtail.contrib.styleguide',
     'wagtail.embeds',
@@ -46,7 +45,7 @@
     'wagtail.images',
     'wagtail.search',
     'wagtail.admin',
-    'wagtail.core',
+    'wagtail',
     'wagtail.api.v2',
     'rest_framework',
     'modelcluster',

ov_wag/tests/test_api.py

@@ -1,7 +1,7 @@
 import wagtail_factories
 from rest_framework import status
 from rest_framework.test import APITestCase
-from wagtail.core.models import Site
+from wagtail.models import Site
 
 from exhibits.models import ExhibitPageApiSchema
 from exhibits.tests.factories import ExhibitPageFactory

ov_wag/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