Add support for Wagtail 6.0

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.11
 
       - name: Install dependencies
         run: |
@@ -33,12 +33,18 @@ jobs:
       matrix:
         python: ['3.8', '3.11']
         django: ['3.2', '4.2']
-        wagtail: ['4.1', '5.2']
+        wagtail: ['4.1', '5.2', '6.0']
         exclude:
+          - django: '3.2'
+            wagtail: '6.0'
           - django: '4.2'
             wagtail: '4.1'
           - python: '3.11'
             django: '3.2'
+        include:
+          - python: '3.11'
+            django: '5.0'
+            wagtail: '6.0'
 
     steps:
       - uses: actions/checkout@v3
@@ -79,7 +85,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
+          python-version: "3.11"
 
       - name: Install dependencies
         run: |

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ repos:
       args: ["wagtailinventory", "setup.py", "--line-length=79"]
       exclude: migrations
 -   repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.254
+    rev: v0.2.2
     hooks:
       - id: ruff
         exclude: migrations

README.rst

@@ -55,8 +55,8 @@ Compatibility
 This code has been tested for compatibility with:
 
 * Python 3.8+
-* Django 3.2 (LTS), 4.2 (LTS)
-* Wagtail 3.0+, including 5.2 (LTS)
+* Django 3.2 (LTS), 4.2 (LTS), 5.0
+* Wagtail 3.0+, including 5.2 (LTS) and 6.0
 
 It should be compatible with all intermediate versions, as well.
 If you find that it is not, please `file an issue <https://github.com/cfpb/wagtail-inventory/issues/new>`_.

pyproject.toml

@@ -17,10 +17,12 @@ classifiers = [
     "Framework :: Django",
     "Framework :: Django :: 3.2",
     "Framework :: Django :: 4.2",
+    "Framework :: Django :: 5.0",
     "Framework :: Wagtail",
     "Framework :: Wagtail :: 3",
     "Framework :: Wagtail :: 4",
     "Framework :: Wagtail :: 5",
+    "Framework :: Wagtail :: 6",
     "License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
     "License :: Public Domain",
     "Programming Language :: Python",
@@ -93,6 +95,8 @@ exclude = [
     ".venv",
     "venv",
 ]
+
+[tool.ruff.lint]
 ignore = []
 select = [
     "E",

tox.ini

@@ -3,7 +3,8 @@ skipsdist=True
 envlist=
     lint,
     python{3.8}-django{3.2}-wagtail{4.1,5.2}
-    python{3.8,3.11}-django{4.2}-wagtail{5.2}
+    python{3.8,3.11}-django{4.2}-wagtail{5.2,6.0}
+    python3.11-django5.0-wagtail6.0
     coverage
 
 [testenv]
@@ -18,11 +19,13 @@ basepython=
 deps=
     django3.2: Django>=3.2,<3.3
     django4.2: Django>=4.2,<4.3
+    django5.0: Django>=5.0,<5.1
     wagtail4.1: wagtail>=4.1,<5.0
     wagtail5.2: wagtail>=5.2,<5.3
+    wagtail6.0: wagtail>=6.0,<6.1
 
 [testenv:lint]
-basepython=python3.8
+basepython=python3.11
 deps=
     black
     ruff
@@ -33,7 +36,7 @@ commands=
     isort --check-only --diff wagtailinventory testmanage.py
 
 [testenv:coverage]
-basepython=python3.8
+basepython=python3.11
 deps=
     coverage[toml]
     diff_cover
@@ -46,7 +49,7 @@ commands=
 [testenv:interactive]
 basepython=python3.11
 deps=
-    Django>=4.2,<4.3
+    Django>=5.0,<5.1
 
 commands_pre=
     python {toxinidir}/testmanage.py makemigrations

wagtailinventory/fixtures/test_blocks.json

@@ -25,7 +25,7 @@
         "locked": false,
         "first_published_at": null,
         "last_published_at": null,
-        "latest_revision_created_at": "2018-06-11T11:43:21.991",
+        "latest_revision_created_at": "2018-06-11T11:43:21.991Z",
         "live_revision": null
     }
 },
@@ -55,7 +55,7 @@
         "locked": false,
         "first_published_at": null,
         "last_published_at": null,
-        "latest_revision_created_at": "2018-06-11T11:43:38.252",
+        "latest_revision_created_at": "2018-06-11T11:43:38.252Z",
         "live_revision": null
     }
 },
@@ -85,7 +85,7 @@
         "locked": false,
         "first_published_at": null,
         "last_published_at": null,
-        "latest_revision_created_at": "2018-06-11T11:44:22.660",
+        "latest_revision_created_at": "2018-06-11T11:44:22.660Z",
         "live_revision": null
     }
 },
@@ -115,7 +115,7 @@
         "locked": false,
         "first_published_at": null,
         "last_published_at": null,
-        "latest_revision_created_at": "2018-06-11T11:44:47.772",
+        "latest_revision_created_at": "2018-06-11T11:44:47.772Z",
         "live_revision": null
     }
 },
@@ -145,7 +145,7 @@
         "locked": false,
         "first_published_at": null,
         "last_published_at": null,
-        "latest_revision_created_at": "2018-06-11T11:45:01.819",
+        "latest_revision_created_at": "2018-06-11T11:45:01.819Z",
         "live_revision": null
     }
 },

wagtailinventory/tests/settings.py

@@ -90,3 +90,5 @@
 ROOT_URLCONF = "wagtailinventory.tests.urls"
 
 WAGTAILADMIN_BASE_URL = "http://localhost:8000"
+
+USE_TZ = True

wagtailinventory/views.py

@@ -1,9 +1,7 @@
+import wagtail
 from wagtail.admin.auth import permission_denied
 from wagtail.admin.filters import ContentTypeFilter, WagtailFilterSet
 from wagtail.admin.views.reports import PageReportView
-from wagtail.admin.views.reports.aging_pages import (
-    get_content_types_for_filter,
-)
 from wagtail.models import Page
 
 import django_filters
@@ -12,6 +10,18 @@
 from wagtailinventory.models import PageBlock
 
 
+if wagtail.VERSION >= (6,):
+    from wagtail.models import get_page_content_types
+else:  # pragma: no cover
+    # For Wagtail < 6, use an older method to get the list of page types.
+    from wagtail.admin.views.reports.aging_pages import (
+        get_content_types_for_filter,
+    )
+
+    def get_page_content_types(include_base_page_type=True):
+        return get_content_types_for_filter()
+
+
 class BlockAutocompleteView(autocomplete.Select2ListView):
     def get_list(self):
         return (
@@ -41,7 +51,7 @@ class BlockInventoryFilterSet(WagtailFilterSet):
     )
     content_type = ContentTypeFilter(
         label="Page Type",
-        queryset=lambda request: get_content_types_for_filter(),
+        queryset=lambda request: get_page_content_types(),
     )
 
     class Meta:

wagtailinventory/wagtail_hooks.py

@@ -1,7 +1,6 @@
 from django.contrib.auth.models import Permission
 from django.urls import include, path, reverse
 
-from wagtail import VERSION as WAGTAIL_VERSION
 from wagtail import hooks
 from wagtail.admin.menu import MenuItem
 
@@ -46,13 +45,10 @@ def is_shown(self, request):
 
 @hooks.register("register_reports_menu_item")
 def register_inventory_report_menu_item():
-    key = "classname" if WAGTAIL_VERSION >= (5, 2) else "classnames"
-    icon = "icon icon-" + BlockInventoryReportView.header_icon
-
     return CanViewBlockInventoryMenuItem(
         "Block inventory",
         reverse("wagtailinventory:block_inventory_report"),
-        **{key: icon},
+        icon_name=BlockInventoryReportView.header_icon,
     )