Bump Wagtail from 6.4.2 to 7.0.4 (#15355)

* Bump Wagtail from 6.4.2 to 7.0.4

* Update StreamBlock clean method

* Fix linting issues

Author: adalcima

foundation_cms/base/apps.py

@@ -6,6 +6,9 @@ class FoundationCMSConfig(AppConfig):
     name = "foundation_cms.base"
 
     def ready(self):
+        # Import a patch for wagtail-localize-git classnames issue with Wagtail 7.0
+        import foundation_cms.base.patches.wagtail_localize_git_classnames  # noqa: F401
+
         # Import a patch for wagtail-localize image blocks
         import foundation_cms.base.patches.wagtail_localize_image_block  # noqa: F401
 

foundation_cms/base/patches/wagtail_localize_git_classnames.py

@@ -0,0 +1,40 @@
+"""
+Patch for wagtail-localize-git compatibility with Wagtail 7.0
+
+Wagtail 7.0 removed the 'classnames' parameter from MenuItem classes in favor of 'classname'.
+wagtail-localize-git 0.15.0 still uses the old 'classnames' parameter, causing:
+TypeError: MenuItem.__init__() got an unexpected keyword argument 'classnames'
+
+This patch automatically converts 'classnames' to 'classname' to maintain compatibility.
+
+@TODO: Remove this patch when wagtail-localize-git releases a version compatible with Wagtail 7.0.
+"""
+
+from wagtail.admin.menu import MenuItem
+
+
+def patched_menuitem_init(original_init):
+    """
+    Decorator to patch MenuItem.__init__ to handle classnames -> classname conversion
+    """
+
+    def wrapper(self, *args, **kwargs):
+        # Convert 'classnames' to 'classname' if present
+        if "classnames" in kwargs:
+            # If both classnames and classname are present, prioritize classname
+            if "classname" not in kwargs:
+                kwargs["classname"] = kwargs["classnames"]
+            # Remove the deprecated classnames parameter
+            kwargs.pop("classnames")
+
+        # Call the original __init__ method
+        return original_init(self, *args, **kwargs)
+
+    return wrapper
+
+
+# Store original method for potential restoration
+_original_menuitem_init = MenuItem.__init__
+
+# Apply the patch
+MenuItem.__init__ = patched_menuitem_init(_original_menuitem_init)

foundation_cms/blocks/hero_accordion.py

@@ -72,8 +72,8 @@ def __init__(self, min_panels=2, max_panels=3, max_video_panels=1, **kwargs):
     video_panel = VideoPanelBlock()
     image_text_panel = ImageTextPanelBlock()
 
-    def clean(self, value):
-        cleaned = super().clean(value)
+    def clean(self, value, ignore_required_constraints=False):
+        cleaned = super().clean(value, ignore_required_constraints)
         video_count = sum(1 for block in cleaned if block.block_type == "video_panel")
 
         if len(cleaned) < self.min_panels:

foundation_cms/legacy_apps/wagtailpages/pagemodels/buyersguide/editorial_content_index.py

@@ -165,7 +165,7 @@ class BuyersGuideEditorialContentIndexPageArticlePageRelation(TranslatableMixin,
     )
     article = models.ForeignKey(
         "wagtailpages.BuyersGuideArticlePage",
-        on_delete=wagtail_models.models.CASCADE,
+        on_delete=models.CASCADE,
         null=False,
         blank=False,
     )

requirements.in

@@ -25,7 +25,7 @@ pygit2==1.14.0
 python-slugify
 requests
 social-auth-app-django
-wagtail==6.4.2
+wagtail==7.0.4
 wagtail-ab-testing
 wagtail-color-panel
 wagtail-factories

requirements.txt

@@ -105,7 +105,7 @@ django-stubs-ext==5.2.8
     # via django-tasks
 django-taggit==6.1.0
     # via wagtail
-django-tasks==0.6.1
+django-tasks==0.7.0
     # via wagtail
 django-treebeard==4.5.1
     # via wagtail
@@ -261,7 +261,7 @@ urllib3==2.6.3
     #   sentry-sdk
 user-agents==2.2.0
     # via wagtail-ab-testing
-wagtail==6.4.2
+wagtail==7.0.4
     # via
     #   -r requirements.in
     #   wagtail-ab-testing
@@ -298,6 +298,8 @@ wand==0.6.13
 whitenoise==6.9.0
     # via -r requirements.in
 willow[heif]==1.11.0
-    # via wagtail
+    # via
+    #   wagtail
+    #   willow
 wrapt==1.16.0
     # via scout-apm