Merge pull request #361 from djangonaut-space/develop

Prod deploy - wagtail and other dependency upgrade

accounts/models.py

@@ -9,7 +9,7 @@
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.urls import reverse
-from wagtail.core.models import Orderable
+from wagtail.models import Orderable
 
 from accounts.fields import DefaultOneToOneField
 

home/blocks.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from wagtail.blocks import StreamBlock
+from wagtail import blocks
 from wagtail.contrib.table_block.blocks import TableBlock
-from wagtail.core import blocks
 from wagtail.images.blocks import ImageChooserBlock
 
 CODE_LANGUAGE_OPTIONS = (
@@ -232,7 +231,7 @@ class Meta:
         template = "blocks/rich_text.html"
 
 
-class BaseStreamBlock(StreamBlock):
+class BaseStreamBlock(blocks.StreamBlock):
     heading = HeadingBlock(label="Heading", icon="h1")
     rich_text = RichTextBlock()
     list = ListBlock(label="List", icon="list-ol")

home/models/blog.py

@@ -6,14 +6,14 @@
 from modelcluster.fields import ParentalKey
 from puput.abstracts import EntryAbstract
 from taggit.models import TaggedItemBase
-from wagtail.admin.edit_handlers import FieldPanel
-from wagtail.admin.edit_handlers import MultiFieldPanel
+from wagtail import blocks
+from wagtail.admin.panels import FieldPanel
 from wagtail.admin.panels import InlinePanel
+from wagtail.admin.panels import MultiFieldPanel
 from wagtail.admin.panels import PageChooserPanel
 from wagtail.contrib.table_block.blocks import TableBlock
-from wagtail.core import blocks
-from wagtail.core.fields import RichTextField
-from wagtail.core.fields import StreamField
+from wagtail.fields import RichTextField
+from wagtail.fields import StreamField
 from wagtail.images.blocks import ImageChooserBlock
 from wagtail.models import Page