Allow wagtail>=2.9,<2.17
This commit is contained in:
3
setup.py
3
setup.py
@@ -1,8 +1,9 @@
|
||||
import re
|
||||
|
||||
from setuptools import find_packages, setup
|
||||
|
||||
install_requires = [
|
||||
'wagtail>=2.0',
|
||||
'wagtail>=2.9,<2.17',
|
||||
'user-agents>=1.1.0',
|
||||
'wagtailfontawesome>=1.1.3',
|
||||
'pycountry',
|
||||
|
@@ -1,5 +1,4 @@
|
||||
import os
|
||||
from importlib.util import find_spec
|
||||
|
||||
DATABASES = {
|
||||
'default': {
|
||||
@@ -61,11 +60,6 @@ MIDDLEWARE = (
|
||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||
)
|
||||
|
||||
if find_spec('wagtail.contrib.legacy'):
|
||||
MIDDLEWARE += ('wagtail.contrib.legacy.sitemiddleware.SiteMiddleware',)
|
||||
else:
|
||||
MIDDLEWARE += ('wagtail.core.middleware.SiteMiddleware', )
|
||||
|
||||
|
||||
INSTALLED_APPS = (
|
||||
'wagtail_personalisation',
|
||||
|
16
tox.ini
16
tox.ini
@@ -1,29 +1,37 @@
|
||||
[tox]
|
||||
envlist =
|
||||
flake8
|
||||
py{36,37,38}-dj{22}-wt{211,212,213}
|
||||
py{37,38}-dj{30,31}-wt{211,212,213}
|
||||
py{37,38}-dj{22}-wt{211,212,213}
|
||||
py{37,38,39}-dj{30,31}-wt{211,212,213}
|
||||
py{37,38,39}-dj{30,31,32}-wt{214,215}
|
||||
py{37,38,39,310}-dj{30,31,32}-wt{215,216}
|
||||
|
||||
[gh-actions]
|
||||
python =
|
||||
3.6: py36
|
||||
3.7: py37
|
||||
3.8: py38
|
||||
3.9: py39
|
||||
3.10: py310
|
||||
|
||||
[testenv]
|
||||
basepython =
|
||||
py36: python3.6
|
||||
py37: python3.7
|
||||
py38: python3.8
|
||||
py39: python3.9
|
||||
py310: python3.10
|
||||
commands = coverage run --parallel -m pytest -rs {posargs}
|
||||
extras = test
|
||||
deps =
|
||||
dj22: Django>=2.2.8,<2.3
|
||||
dj30: Django>=3.0,<3.1
|
||||
dj31: Django>=3.1,<3.2
|
||||
dj32: Django>=3.2,<3.3
|
||||
wt211: wagtail>=2.11,<2.12
|
||||
wt212: wagtail>=2.12,<2.13
|
||||
wt213: wagtail>=2.13,<2.14
|
||||
wt214: wagtail>=2.14,<2.15
|
||||
wt215: wagtail>=2.15,<2.16
|
||||
wt216: wagtail>=2.16,<2.17
|
||||
geoip2: geoip2
|
||||
|
||||
[testenv:coverage-report]
|
||||
|
Reference in New Issue
Block a user