Support wagtail42

.github/workflows/python-test.yml

@@ -20,67 +20,22 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
-      max-parallel: 4
+      max-parallel: 5
       matrix:
-        tox_env:
-          - py36-dj22-wt211
-          - py36-dj22-wt212
-          - py36-dj22-wt213
-          - py37-dj22-wt211
-          - py37-dj22-wt212
-          - py37-dj22-wt213
-          - py38-dj22-wt211
-          - py38-dj22-wt212
-          - py38-dj22-wt213
-          - py37-dj30-wt211
-          - py37-dj30-wt212
-          - py37-dj30-wt213
-          - py38-dj30-wt211
-          - py38-dj30-wt212
-          - py38-dj30-wt213
-        include:
-          - python-version: 3.6
-            tox_env: py36-dj22-wt211
-          - python-version: 3.6
-            tox_env: py36-dj22-wt212
-          - python-version: 3.6
-            tox_env: py36-dj22-wt213
-          - python-version: 3.7
-            tox_env: py37-dj22-wt211
-          - python-version: 3.7
-            tox_env: py37-dj22-wt212
-          - python-version: 3.7
-            tox_env: py37-dj22-wt213
-          - python-version: 3.8
-            tox_env: py38-dj22-wt211
-          - python-version: 3.8
-            tox_env: py38-dj22-wt212
-          - python-version: 3.8
-            tox_env: py38-dj22-wt213
-          - python-version: 3.7
-            tox_env: py37-dj30-wt211
-          - python-version: 3.7
-            tox_env: py37-dj30-wt212
-          - python-version: 3.7
-            tox_env: py37-dj30-wt213
-          - python-version: 3.8
-            tox_env: py38-dj30-wt211
-          - python-version: 3.8
-            tox_env: py38-dj30-wt212
-          - python-version: 3.8
-            tox_env: py38-dj30-wt213
+        python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+      - uses: actions/checkout@v3
+      - name: Setup Python
+        uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ matrix.python }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox tox-gh-actions
+          python -m pip install tox tox-gh-actions
       - name: Test with tox
-        run: tox -e ${{ matrix.tox_env }} --index-url=https://pypi.python.org/simple/
+        run: tox
       - name: Prepare artifacts
         run: mkdir -p .coverage-data && mv .coverage.* .coverage-data/
       - uses: actions/upload-artifact@master

.gitignore

@@ -26,3 +26,5 @@ node_modules
 .DS_Store
 
 .pytest_cache/
+
+venv/

Makefile

@@ -17,13 +17,13 @@ install: develop
 develop: clean requirements
 
 test:
-	py.test --nomigrations --reuse-db tests/
+	py.test --reuse-db tests/
 
 retest:
-	py.test --nomigrations --reuse-db tests/ -vvv
+	py.test --reuse-db tests/ -vvv
 
 coverage:
-	py.test --nomigrations --reuse-db tests/ --cov=wagtail_personalisation --cov-report=term-missing --cov-report=html
+	py.test --reuse-db tests/ --cov=wagtail_personalisation --cov-report=term-missing --cov-report=html
 
 docs:
 	$(MAKE) -C docs html

README.rst

@@ -37,7 +37,7 @@ in the admin interface.
 
 Instructions
 ------------
-Wagtail Personalisation requires Wagtail 2.0 or 2.1 and Django 1.11 or 2.0.
+Wagtail Personalisation requires Wagtail 4.1+ and Django 3.2+
 
 To install the package with pip:
 

docs/conf.py

@@ -20,14 +20,15 @@
 import os
 import sys
 
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 
 if not on_rtd:  # only import and set the theme if we're building docs locally
     import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
+
+    html_theme = "sphinx_rtd_theme"
     html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
-sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath("."))
 
 # -- General configuration ------------------------------------------------
 
@@ -41,31 +42,31 @@
 extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = 'wagtail-personalisation'
-copyright = '2019, Lab Digital BV'
-author = 'Lab Digital BV'
+project = "wagtail-personalisation"
+copyright = "2019, Lab Digital BV"
+author = "Lab Digital BV"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.15.3'
+version = "0.15.3"
 
 # The full version, including alpha/beta/rc tags.
-release = '0.15.3'
+release = "0.15.3"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -77,10 +78,10 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
@@ -99,10 +100,10 @@
 #
 # html_theme_options = {}
 html_theme_options = {
-    'analytics_id': 'UA-100203499-2',
+    "analytics_id": "UA-100203499-2",
 }
 
-html_logo = 'logo.png'
+html_logo = "logo.png"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -113,7 +114,7 @@
 # -- Options for HTMLHelp output ------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'wagtail-personalisationdoc'
+htmlhelp_basename = "wagtail-personalisationdoc"
 
 
 # -- Options for LaTeX output ---------------------------------------------
@@ -122,15 +123,12 @@
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -140,8 +138,13 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'wagtail-personalisation.tex', 'wagtail-personalisation Documentation',
-     'Lab Digital BV', 'manual'),
+    (
+        master_doc,
+        "wagtail-personalisation.tex",
+        "wagtail-personalisation Documentation",
+        "Lab Digital BV",
+        "manual",
+    ),
 ]
 
 
@@ -150,8 +153,13 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'wagtail-personalisation', 'wagtail-personalisation Documentation',
-     [author], 1)
+    (
+        master_doc,
+        "wagtail-personalisation",
+        "wagtail-personalisation Documentation",
+        [author],
+        1,
+    )
 ]
 
 
@@ -161,7 +169,13 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'wagtail-personalisation', 'wagtail-personalisation Documentation',
-     author, 'wagtail-personalisation', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "wagtail-personalisation",
+        "wagtail-personalisation Documentation",
+        author,
+        "wagtail-personalisation",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]

docs/getting_started/installation.rst

@@ -1,7 +1,7 @@
 Installing Wagxperience
 =======================
 
-Wagtail Personalisation requires Wagtail_ 2.0 or 2.1 and Django_ 1.11 or 2.0.
+Wagtail Personalisation requires Wagtail_ 4.1+ and Django_ 3.2+
 
 .. _Wagtail: https://github.com/wagtail/wagtail
 .. _Django: https://github.com/django/django

docs/usage_guide/implementation.rst

@@ -17,7 +17,7 @@ A very simple example for a personalisable homepage:
 
 .. code-block:: python
 
-    from wagtail.wagtailcore.models import Page
+    from wagtail.models import Page
     from wagtail_personalisation.models import PersonalisablePageMixin
 
     class HomePage(PersonalisablePageMixin, Page):

sandbox/requirements.txt

@@ -1,4 +1,4 @@
-Django>=2.2,<2.3
-wagtail>=2.6,<2.7
-django-debug-toolbar==2.0
+Django>=3.2,<4.2
+wagtail>=4.1,<4.3
+django-debug-toolbar
 -e .[docs,test]

sandbox/sandbox/apps/__init__.py

@@ -1 +0,0 @@
-

sandbox/sandbox/apps/home/migrations/0001_initial.py

@@ -2,29 +2,38 @@
 # Generated by Django 1.11.1 on 2017-05-31 16:59
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
-import modelcluster.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     initial = True
 
     dependencies = [
-        ('wagtailcore', '0033_remove_golive_expiry_help_text'),
-        ('wagtail_personalisation', '0011_personalisablepagemetadata'),
+        ("wagtailcore", "0033_remove_golive_expiry_help_text"),
+        ("wagtail_personalisation", "0011_personalisablepagemetadata"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='HomePage',
+            name="HomePage",
             fields=[
-                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
+                (
+                    "page_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="wagtailcore.Page",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('wagtailcore.page', models.Model),
+            bases=("wagtailcore.page", models.Model),
         ),
     ]