Use wagtail_modeladmin as separate package (#4366)

Fixes #4363 

It will remove the warnings of wagtail upgrade. Although we are thinking
of migrating to Snippets as #4364 but modeladmin will also not be an
issue for now.

hypha/apply/categories/admin.py

@@ -1,5 +1,5 @@
 from django.urls import re_path
-from wagtail.contrib.modeladmin.options import ModelAdmin
+from wagtail_modeladmin.options import ModelAdmin
 
 from hypha.apply.utils.admin import AdminIcon
 

hypha/apply/categories/admin_helpers.py

@@ -1,5 +1,5 @@
 from django.contrib.admin.utils import quote
-from wagtail.contrib.modeladmin.helpers import ButtonHelper
+from wagtail_modeladmin.helpers import ButtonHelper
 
 
 class MetaTermButtonHelper(ButtonHelper):

hypha/apply/categories/admin_views.py

@@ -1,6 +1,6 @@
 from django.contrib.admin.utils import unquote
 from django.shortcuts import get_object_or_404
-from wagtail.contrib.modeladmin.views import CreateView
+from wagtail_modeladmin.views import CreateView
 
 
 class AddChildMetaTermViewClass(CreateView):

hypha/apply/determinations/admin.py

@@ -1,6 +1,6 @@
 from django.urls import re_path
-from wagtail.contrib.modeladmin.options import ModelAdmin
-from wagtail.contrib.modeladmin.views import CreateView, InstanceSpecificView
+from wagtail_modeladmin.options import ModelAdmin
+from wagtail_modeladmin.views import CreateView, InstanceSpecificView
 
 from hypha.apply.determinations.models import (
     DeterminationForm,

hypha/apply/determinations/admin_views.py

@@ -1,4 +1,4 @@
-from wagtail.contrib.modeladmin.views import CreateView, EditView
+from wagtail_modeladmin.views import CreateView, EditView
 
 from hypha.apply.utils.blocks import show_admin_form_error_messages
 

hypha/apply/funds/admin.py

@@ -1,7 +1,7 @@
 from django.urls import re_path
 from django.utils.safestring import mark_safe
-from wagtail.contrib.modeladmin.helpers import PermissionHelper
-from wagtail.contrib.modeladmin.options import ModelAdmin, ModelAdminGroup
+from wagtail_modeladmin.helpers import PermissionHelper
+from wagtail_modeladmin.options import ModelAdmin, ModelAdminGroup
 
 from hypha.apply.categories.admin import CategoryAdmin, MetaTermAdmin
 from hypha.apply.determinations.admin import (

hypha/apply/funds/admin_helpers.py

@@ -5,14 +5,14 @@
 from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
-from wagtail.contrib.modeladmin.forms import ParentChooserForm
-from wagtail.contrib.modeladmin.helpers import (
+from wagtail.models import Page
+from wagtail_modeladmin.forms import ParentChooserForm
+from wagtail_modeladmin.helpers import (
     ButtonHelper,
     PageAdminURLHelper,
     PageButtonHelper,
 )
-from wagtail.contrib.modeladmin.views import ChooseParentView
-from wagtail.models import Page
+from wagtail_modeladmin.views import ChooseParentView
 
 
 class VerboseLabelModelChoiceField(forms.ModelChoiceField):

hypha/apply/funds/admin_views.py

@@ -6,8 +6,8 @@
 from wagtail.admin import messages
 from wagtail.admin.forms.pages import CopyForm
 from wagtail.admin.views.pages.utils import get_valid_next_url_from_request
-from wagtail.contrib.modeladmin.views import CreateView, EditView
 from wagtail.models import Page
+from wagtail_modeladmin.views import CreateView, EditView
 
 from hypha.apply.funds.utils import get_copied_form_name
 from hypha.apply.utils.blocks import show_admin_form_error_messages

hypha/apply/funds/wagtail_hooks.py

@@ -1,6 +1,6 @@
 from django.contrib.auth.models import Permission
 from wagtail import hooks
-from wagtail.contrib.modeladmin.options import modeladmin_register
+from wagtail_modeladmin.options import modeladmin_register
 
 from .admin import ApplyAdminGroup
 from .admin_views import custom_admin_round_copy_view

hypha/apply/projects/admin.py

@@ -1,4 +1,4 @@
-from wagtail.contrib.modeladmin.options import ModelAdmin, ModelAdminGroup
+from wagtail_modeladmin.options import ModelAdmin, ModelAdminGroup
 
 from hypha.apply.utils.admin import AdminIcon, ListRelatedMixin
 from hypha.core.wagtail.admin import SettingModelAdmin

hypha/apply/projects/admin_views.py

@@ -1,4 +1,4 @@
-from wagtail.contrib.modeladmin.views import CreateView, EditView
+from wagtail_modeladmin.views import CreateView, EditView
 
 from hypha.apply.utils.blocks import show_admin_form_error_messages
 

hypha/apply/projects/wagtail_hooks.py

@@ -1,6 +1,6 @@
 from django.conf import settings
-from wagtail.contrib.modeladmin.options import modeladmin_register
 from wagtail.contrib.settings.registry import register_setting
+from wagtail_modeladmin.options import modeladmin_register
 
 from .admin import ProjectAdminGroup
 from .models import ProjectSettings

hypha/apply/review/admin.py

@@ -1,6 +1,6 @@
 from django.urls import re_path
-from wagtail.contrib.modeladmin.options import ModelAdmin
-from wagtail.contrib.modeladmin.views import CreateView, InstanceSpecificView
+from wagtail_modeladmin.options import ModelAdmin
+from wagtail_modeladmin.views import CreateView, InstanceSpecificView
 
 from hypha.apply.review.models import ReviewForm
 from hypha.apply.utils.admin import AdminIcon, ListRelatedMixin

hypha/apply/review/admin_helpers.py

@@ -1,4 +1,4 @@
-from wagtail.contrib.modeladmin.helpers import PageButtonHelper
+from wagtail_modeladmin.helpers import PageButtonHelper
 
 
 class ButtonsWithClone(PageButtonHelper):

hypha/apply/review/admin_views.py

@@ -1,4 +1,4 @@
-from wagtail.contrib.modeladmin.views import CreateView, EditView
+from wagtail_modeladmin.views import CreateView, EditView
 
 from hypha.apply.utils.blocks import show_admin_form_error_messages
 

hypha/core/wagtail/admin/options.py

@@ -1,10 +1,10 @@
 from django.contrib.auth.models import Permission
 from django.core.exceptions import ImproperlyConfigured
-from wagtail.contrib.modeladmin.helpers import PagePermissionHelper, PermissionHelper
-from wagtail.contrib.modeladmin.options import WagtailRegisterable
 from wagtail.contrib.settings.models import BaseSiteSetting
 from wagtail.contrib.settings.registry import SettingMenuItem
 from wagtail.models import Page
+from wagtail_modeladmin.helpers import PagePermissionHelper, PermissionHelper
+from wagtail_modeladmin.options import WagtailRegisterable
 
 
 class SettingModelAdmin(WagtailRegisterable):

hypha/settings/django.py

@@ -28,7 +28,7 @@
     "django_htmx",
     "heroicons",
     "django_web_components",
-    "wagtail.contrib.modeladmin",
+    "wagtail_modeladmin",
     "wagtail.contrib.settings",
     "wagtail.contrib.forms",
     "wagtail.contrib.redirects",

pyproject.toml

@@ -61,6 +61,7 @@ dependencies = [
     "whitenoise~=6.8.2",
     "xhtml2pdf~=0.2.16",
     "xmltodict~=0.14.2",
+    "wagtail-modeladmin>=2.1.0",
 ]
 
 [dependency-groups]

requirements/dev.txt

@@ -1363,6 +1363,9 @@ wagtail==5.2.7 \
 wagtail-factories==4.2.1 \
     --hash=sha256:7a180fc1b074af7a78648c634740ee89d4dbb45899917744b66431d38155b6ae \
     --hash=sha256:bfe158092982a2b30a3e603c482242905df0b163fc69573fa6f159df482175c5
+wagtail-modeladmin==2.1.0 \
+    --hash=sha256:4ef3cfde4fb4858e8e17e26bb322ea1d44836c07b3e016d6921599caba67503a \
+    --hash=sha256:a83502b0c02d2376cde33d81eb607ae10be95840b35072404cca877da161f7da
 watchdog==6.0.0 \
     --hash=sha256:07df1fdd701c5d4c8e55ef6cf55b8f0120fe1aef7ef39a1c6fc6bc2e606d517a \
     --hash=sha256:20ffe5b202af80ab4266dcd3e91aae72bf2da48c0d33bdb15c66658e685e94e2 \

requirements/prod.txt

@@ -925,6 +925,9 @@ vine==5.1.0 \
 wagtail==5.2.7 \
     --hash=sha256:0cbb3003c4e69c4d88f56d9b1beacd525a06b8a4131103dca0c16e516dfc3455 \
     --hash=sha256:76cf65ccdf11ab60ffd36162a82df17bfef13a33120159a95d424fa6f8767bc3
+wagtail-modeladmin==2.1.0 \
+    --hash=sha256:4ef3cfde4fb4858e8e17e26bb322ea1d44836c07b3e016d6921599caba67503a \
+    --hash=sha256:a83502b0c02d2376cde33d81eb607ae10be95840b35072404cca877da161f7da
 wcwidth==0.2.13 \
     --hash=sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859 \
     --hash=sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5