From 3191849b6b28b9b85bdcf639b43955d882e0322f Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Sun, 3 Dec 2017 00:58:23 +0000 Subject: [PATCH] Update setup.py and docs to mention Django 2.0 support --- README.rst | 2 +- docs/getting_started/integrating_into_django.rst | 2 +- setup.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 989e98b1ba..9ef9acca0d 100644 --- a/README.rst +++ b/README.rst @@ -80,7 +80,7 @@ We thank `BrowserStack `_, who provide the projec Compatibility ~~~~~~~~~~~~~ -Wagtail supports Django 1.11.x on Python 3.4, 3.5 and 3.6. Supported database backends are PostgreSQL, MySQL and SQLite. +Wagtail supports Django 1.11.x and 2.0 on Python 3.4, 3.5 and 3.6. Supported database backends are PostgreSQL, MySQL and SQLite. Contributing ~~~~~~~~~~~~ diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index 40131a2f29..77961f1545 100644 --- a/docs/getting_started/integrating_into_django.rst +++ b/docs/getting_started/integrating_into_django.rst @@ -5,7 +5,7 @@ Integrating Wagtail into a Django project Wagtail provides the ``wagtail start`` command and project template to get you started with a new Wagtail project as quickly as possible, but it's easy to integrate Wagtail into an existing Django project too. -Wagtail is currently compatible with Django 1.11. First, install the ``wagtail`` package from PyPI: +Wagtail is currently compatible with Django 1.11 and 2.0. First, install the ``wagtail`` package from PyPI: .. code-block:: console diff --git a/setup.py b/setup.py index ffb66f9a0b..f5c084c308 100755 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ except ImportError: install_requires = [ - "Django>=1.11,<1.12", + "Django>=1.11,<2.1", "django-modelcluster>=3.1,<4.0", "django-taggit>=0.20,<1.0", "django-treebeard>=3.0,<5.0", @@ -87,6 +87,7 @@ setup( 'Programming Language :: Python :: 3.6', 'Framework :: Django', 'Framework :: Django :: 1.11', + 'Framework :: Django :: 2.0', 'Topic :: Internet :: WWW/HTTP :: Site Management', ], install_requires=install_requires,