Wagtail 6.0

.github/workflows/test.yml

@@ -3,7 +3,7 @@ name: Tests
 on:
   pull_request:
     branches:
-      - main
+      - master
   push:
 
 concurrency:
@@ -15,15 +15,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.8", "3.9", "3.10", "3.11"]
+        python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python
         id: setup-python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
 

README.rst

@@ -7,9 +7,9 @@ Add Schema.org JSON-LD to your website
 Installing
 ==========
 
-wagtail-schema.org supports Wagtail 4.1 upwards.
+wagtail-schema.org supports Wagtail 5.2 upwards.
 
-Install for Wagtail 4.1+ using pip:
+Install for Wagtail 5.2+ using pip:
 
 .. code-block:: console
 

setup.py

@@ -22,7 +22,7 @@
     url='https://github.com/takeflight/wagtail-schema.org',
 
     install_requires=[
-        'wagtail>=4.1',
+        'wagtail>=5.2',
     ],
     extras_require={
         'testing': ['jinja2>=2.10,<3.0', 'markupsafe==2.0.1']
@@ -45,15 +45,17 @@
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Framework :: Django',
         'Framework :: Django :: 3',
         'Framework :: Django :: 3.2',
         'Framework :: Django :: 4',
-        'Framework :: Django :: 4.1',
         'Framework :: Django :: 4.2',
+        'Framework :: Django :: 5',
+        'Framework :: Django :: 5.0',
         'Framework :: Wagtail',
-        'Framework :: Wagtail :: 4',
         'Framework :: Wagtail :: 5',
+        'Framework :: Wagtail :: 6',
         'License :: OSI Approved :: BSD License',
     ],
 )

tests/app/urls.py

@@ -2,6 +2,7 @@
 
 from django.conf import settings
 from django.contrib import admin
+from django.urls import path
 from django.urls import include, re_path
 
 from wagtail import urls as wagtail_urls
@@ -11,10 +12,10 @@
 urlpatterns = [
     re_path(r'^django-admin/', admin.site.urls),
 
-    re_path(r'^admin/', include(wagtailadmin_urls)),
-    re_path(r'^documents/', include(wagtaildocs_urls)),
+    path('admin/', include(wagtailadmin_urls)),
+    path('documents/', include(wagtaildocs_urls)),
 
-    re_path(r'', include(wagtail_urls)),
+    path('', include(wagtail_urls)),
 ]
 
 

tests/settings.py

@@ -76,7 +76,6 @@
 LANGUAGE_CODE = 'en-au'
 TIME_ZONE = 'Australia/Hobart'
 USE_I18N = True
-USE_L10N = True
 USE_TZ = True
 
 

tox.ini

@@ -2,10 +2,9 @@
 skip_missing_interpreters = True
 
 envlist =
-	py{38,39,310}-dj{32,41}-wt{41,42,50,51,52}
-	py311-dj41-wt{41,42,50,51,52}
-	py311-dj42-wt{50,51,52}
-	py312-dj42-wt{52}
+	py{38,39,310}-dj32-wt52
+    py{38,39,310,311}-dj42-wt{52,60}
+    py{311,312}-dj50-wt{52,60}
 	flake8,isort,docs
 
 [gh-actions]
@@ -26,14 +25,11 @@ pip_pre = True
 deps =
 	{[base]deps}
 	dj32: django>=3.2,<4.0
-	dj41: django>=4.1,<4.2
 	dj42: django>=4.2,<4.3
+	dj50: django>=5.0,<5.1
 	djHEAD: django
-	wt41: Wagtail>=4.1,<4.2
-	wt42: Wagtail>=4.2,<4.3
-	wt50: Wagtail>=5.0,<5.1
-	wt51: Wagtail>=5.1,<5.2
 	wt52: Wagtail>=5.2,<5.3
+	wt60: Wagtail>=6.0,<6.1
 	wtHEAD: Wagtail
 
 [testenv:flake8]