From 9b5271d6f69b1f8fd14ab1d846fb8616e8a7ab58 Mon Sep 17 00:00:00 2001 From: Craig Davies Date: Thu, 6 Aug 2020 17:24:35 -0400 Subject: [PATCH 1/3] Update to support wagtail 2.10rc2 --- .travis.yml | 4 ++++ README.md | 2 +- setup.py | 2 +- tox.ini | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b5b48f..2d76f6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,10 @@ matrix: python: 3.6 - env: TOXENV=py38-dj22-wag29 python: 3.8 + - env: TOXENV=py36-dj22-wag210 + python: 3.6 + - env: TOXENV=py38-dj22-wag210 + python: 3.8 install: pip install tox coveralls diff --git a/README.md b/README.md index 92ad080..e891fde 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Wagtail-TreeModelAdmin is an extension for Wagtail's [ModelAdmin](http://docs.wa - Python 3.6, 3.8 - Django 1.11, 2.2 -- Wagtail 2.3, 2.9 +- Wagtail 2.3, 2.9, 2.10 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-treemodeladmin/issues/new). diff --git a/setup.py b/setup.py index 59571a0..d7fc297 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ install_requires = [ - "wagtail>=2.3,<2.10", + "wagtail>=2.3,<2.11", ] diff --git a/tox.ini b/tox.ini index 4abf218..12190e7 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ skipsdist=True envlist= lint, py{36}-dj{111,22}-wag{23}, - py{36,38}-dj{22}-wag{29} + py{36,38}-dj{22}-wag{29,210} [testenv] install_command=pip install -e ".[testing]" -U {opts} {packages} @@ -23,6 +23,7 @@ deps= dj22: Django>=2.2,<2.3 wag23: wagtail>=2.3,<2.4 wag29: wagtail>=2.9,<2.10 + wag210: wagtail==2.10rc2 [testenv:lint] basepython=python3.6 From 42e1a69e10bedbad0a45ada2ea2d48f9e3882afb Mon Sep 17 00:00:00 2001 From: Craig Davies Date: Fri, 7 Aug 2020 11:55:12 -0400 Subject: [PATCH 2/3] RemovedInWagtail211Warning: wagtail.core.middleware.SiteMiddleware and the use of request.site is deprecated --- treemodeladmin/tests/settings.py | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/treemodeladmin/tests/settings.py b/treemodeladmin/tests/settings.py index dca0e76..1da7b4e 100644 --- a/treemodeladmin/tests/settings.py +++ b/treemodeladmin/tests/settings.py @@ -1,7 +1,5 @@ import os -import django - DEBUG = True @@ -37,32 +35,19 @@ "wagtail.users", ) -WAGTAIL_MIDDLEWARE = ("wagtail.core.middleware.SiteMiddleware",) - WAGTAILADMIN_RICH_TEXT_EDITORS = { "default": {"WIDGET": "wagtail.admin.rich_text.DraftailRichTextArea"}, "custom": {"WIDGET": "wagtail.tests.testapp.rich_text.CustomRichTextArea"}, } -if django.VERSION >= (1, 10): - MIDDLEWARE = ( - "django.middleware.common.CommonMiddleware", - "django.contrib.sessions.middleware.SessionMiddleware", - "django.middleware.csrf.CsrfViewMiddleware", - "django.contrib.auth.middleware.AuthenticationMiddleware", - "django.contrib.messages.middleware.MessageMiddleware", - "django.middleware.clickjacking.XFrameOptionsMiddleware", - ) + WAGTAIL_MIDDLEWARE -else: - MIDDLEWARE_CLASSES = ( - "django.middleware.common.CommonMiddleware", - "django.contrib.sessions.middleware.SessionMiddleware", - "django.middleware.csrf.CsrfViewMiddleware", - "django.contrib.auth.middleware.AuthenticationMiddleware", - "django.contrib.auth.middleware.SessionAuthenticationMiddleware", - "django.contrib.messages.middleware.MessageMiddleware", - "django.middleware.clickjacking.XFrameOptionsMiddleware", - ) + WAGTAIL_MIDDLEWARE +MIDDLEWARE = ( + "django.middleware.common.CommonMiddleware", + "django.contrib.sessions.middleware.SessionMiddleware", + "django.middleware.csrf.CsrfViewMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "django.contrib.messages.middleware.MessageMiddleware", + "django.middleware.clickjacking.XFrameOptionsMiddleware", +) INSTALLED_APPS = ( ( From 30476dc73d2d7b886d7be577686e7cf6ced7ddf9 Mon Sep 17 00:00:00 2001 From: Craig Davies Date: Tue, 11 Aug 2020 11:13:31 -0400 Subject: [PATCH 3/3] Change wagtail 2.10rc2 to 2.10 in tox.ini --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 12190e7..afa383c 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ deps= dj22: Django>=2.2,<2.3 wag23: wagtail>=2.3,<2.4 wag29: wagtail>=2.9,<2.10 - wag210: wagtail==2.10rc2 + wag210: wagtail>=2.10,<2.11 [testenv:lint] basepython=python3.6