feat: add wagtail 6 support

AUTHORS

@@ -13,3 +13,5 @@
 * Yed Podtrzitko
 * Francisco Fernández
 * Pep Lluís Miró
+* Wesley van Lee
+* Marco Badan

CHANGELOG.md

@@ -3,6 +3,8 @@ Changelog
 
 Unreleased
 ----------
+* Add Wagtail 6.1 support. Drop Wagtail <=5.2 support.
+
 
 2.0.0 (2023-07-04)
 ------------------

puput/__init__.py

@@ -15,6 +15,7 @@
     "wagtail.sites",
     "wagtail.contrib.redirects",
     "wagtail.contrib.forms",
+    "wagtail.contrib.search_promotions",
     "wagtail.contrib.sitemaps",
     "wagtail.contrib.routable_page",
     "wagtail",

puput/routes.py

@@ -8,7 +8,12 @@
 
 from wagtail.contrib.routable_page.models import RoutablePageMixin, route
 from wagtail.models import Page
-from wagtail.search.models import Query
+import wagtail
+if wagtail.VERSION[:2] < (6, 0):
+    from wagtail.search.models import Query
+else:
+    # https://docs.wagtail.org/en/stable/releases/6.0.html#query-model-moved-to-wagtail-contrib-search-promotions
+    from wagtail.contrib.search_promotions.models import Query
 
 from .utils import get_object_or_None
 

setup.py

@@ -25,7 +25,7 @@ def get_metadata(package, field):
     description='A Django blog app implemented in Wagtail.',
     long_description=codecs.open(os.path.join(os.path.dirname(__file__), 'README.rst'), encoding='utf-8').read(),
     install_requires=[
-        'wagtail>=5.2',
+        'wagtail>=5.2,<7.0',
         'django-el-pagination==4.0.0',
         'django-taggit>=3.1.0,<4.1',
         'wagtail-markdown==0.11.1'