diff --git a/.travis.yml b/.travis.yml index f1ff7a9..5b5b48f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,11 @@ matrix: python: 3.6 - env: TOXENV=py36-dj111-wag23 python: 3.6 - - env: TOXENV=py36-dj20-wag23 - python: 3.6 - env: TOXENV=py36-dj22-wag23 python: 3.6 - - env: TOXENV=py36-dj22-wag28 + - env: TOXENV=py36-dj22-wag29 python: 3.6 - - env: TOXENV=py38-dj22-wag28 + - env: TOXENV=py38-dj22-wag29 python: 3.8 install: diff --git a/README.md b/README.md index 40fe479..66e75b5 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ Wagtail-Flags adds a Wagtail admin UI and Wagtail Site-based condition on top of ## Dependencies - Python 3.6, 3.8 -- Django 1.11, 2.0, 2.2 -- Wagtail 2.3, 2.8 +- Wagtail 2.3, 2.9 +- Django 1.11, 2.2 - Django-Flags 4.2+ It should be compatible at all intermediate versions, as well. diff --git a/setup.py b/setup.py index 8601672..b1a8328 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import find_packages, setup -install_requires = ["wagtail>=2.3,<2.9", "django-flags>=4.2,<5.0"] +install_requires = ["wagtail>=2.3,<2.10", "django-flags>=4.2,<5.0"] testing_extras = ["coverage>=3.7.0"] @@ -13,7 +13,7 @@ long_description=open("README.md", "r").read(), long_description_content_type="text/markdown", license="CC0", - version="4.2.0", + version="4.2.1", include_package_data=True, packages=find_packages(), install_requires=install_requires, @@ -21,8 +21,6 @@ classifiers=[ "Framework :: Django", "Framework :: Django :: 1.11", - "Framework :: Django :: 2.0", - "Framework :: Django :: 2.1", "Framework :: Django :: 2.2", "Framework :: Wagtail", "Framework :: Wagtail :: 2", diff --git a/tox.ini b/tox.ini index 9e7782a..2f83703 100644 --- a/tox.ini +++ b/tox.ini @@ -2,8 +2,8 @@ skipsdist=True envlist= lint, - py{36}-dj{111,20,22}-wag{23}, - py{36,38}-dj{22}-wag{28} + py{36}-dj{111,22}-wag{23}, + py{36,38}-dj{22}-wag{29} [testenv] install_command=pip install -e ".[testing]" -U {opts} {packages} @@ -20,11 +20,9 @@ basepython= deps= dj111: Django>=1.11,<1.12 - dj20: Django>=2.0,<2.1 - dj21: Django>=2.1,<2.2 - dj22: Django>=2.2,<2.3 + dj22: Django>=2.2,<2.3 wag23: wagtail>=2.3,<2.4 - wag28: wagtail>=2.8,<2.9 + wag29: wagtail>=2.9,<2.10 [testenv:lint] basepython=python3.6