Merge branch 'labd:master' into wrds_forms_work

Author: rgs258

.github/workflows/python-test.yml

@@ -27,10 +27,13 @@ jobs:
           - py37-dj32-wt216
           - py38-dj32-wt215
           - py38-dj32-wt216
+          - py38-dj40-wt216
           - py39-dj32-wt215
           - py39-dj32-wt216
+          - py39-dj40-wt216
           - py310-dj32-wt215
-          - py310-dj32-wt216          
+          - py310-dj32-wt216
+          - py310-dj40-wt216          
         include:
           - python-version: 3.7
             tox_env: py37-dj32-wt215
@@ -40,14 +43,20 @@ jobs:
             tox_env: py38-dj32-wt215
           - python-version: 3.8
             tox_env: py38-dj32-wt216
+          - python-version: 3.8
+            tox_env: py38-dj40-wt216
           - python-version: 3.9
             tox_env: py39-dj32-wt215
           - python-version: 3.9
             tox_env: py39-dj32-wt216
+          - python-version: 3.9
+            tox_env: py39-dj40-wt216
           - python-version: "3.10"
             tox_env: py310-dj32-wt215
           - python-version: "3.10"
             tox_env: py310-dj32-wt216 
+          - python-version: "3.10"
+            tox_env: py310-dj40-wt216 
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}

CHANGELOG.rst

@@ -2,6 +2,10 @@
 Changelog
 *********
 
+3.19.0
+------
+* Django 4.0 support
+
 3.18.1
 ------
 * Dropped Django 2.X 3.0 and 3.1 support

example/urls.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.conf.urls.static import static
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.contrib import admin
 
 from wagtail.admin import urls as wagtailadmin_urls
@@ -9,14 +9,14 @@
 
 
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
-    url(r'^cms/', include(wagtailadmin_urls)),
-    url(r'^documents/', include(wagtaildocs_urls)),
+    re_path(r'^admin/', admin.site.urls),
+    re_path(r'^cms/', include(wagtailadmin_urls)),
+    re_path(r'^documents/', include(wagtaildocs_urls)),
 ]
 
 if settings.DEBUG:  # pragma: no cover
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 urlpatterns += [
-    url(r'', include(wagtail_urls)),
+    re_path(r'', include(wagtail_urls)),
 ]

setup.py

@@ -60,12 +60,14 @@
         "Framework :: Wagtail",
         "Framework :: Wagtail :: 2",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Framework :: Django",
-        "Framework :: Django :: 2.0",
-        "Framework :: Django :: 3.0",
+        "Framework :: Django :: 2.2",
+        "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4",
         "Framework :: Wagtail",
         "Framework :: Wagtail :: 2",
         "Topic :: Internet :: WWW/HTTP :: Site Management",

tests/blocks/test_form_block.py

@@ -1,7 +1,7 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.test import override_settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.core.models import Page
 
 from wagtailstreamforms.conf import get_setting

tests/models/test_form.py

@@ -43,24 +43,14 @@
     "wagtail.contrib.redirects.middleware.RedirectMiddleware",
 ]
 
-WAGTAIL_VERSION = re.search("wt[0-9]*", os.environ.get("TOX_ENV_NAME", "wt211"))[0]
+DJANGO_VERSION = int(
+    re.search("dj([0-9]+)", os.environ.get("TOX_ENV_NAME", "dj40")).group(1)
+)
+WAGTAIL_VERSION = int(
+    re.search("wt([0-9]+)", os.environ.get("TOX_ENV_NAME", "wt216")).group(1)
+)
 
-PRE_WAGTAIL_211_VERSIONS = [
-    "wt23",
-    "wt24",
-    "wt25",
-    "wt26",
-    "wt27",
-    "wt28",
-    "wt29",
-    "wt210",
-]
-
-PRE_WAGTAIL_211 = False
-
-if WAGTAIL_VERSION in PRE_WAGTAIL_211_VERSIONS:
-    MIDDLEWARE.append("wagtail.core.middleware.SiteMiddleware")
-    PRE_WAGTAIL_211 = True
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3", "NAME": "testdb"}}