mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-24 01:57:32 +01:00
Code Issues Releases Wiki Activity

Update setup.py and docs to mention Django 2.0 support

Browse Source
This commit is contained in:
Matt Westcott 2017-12-03 00:58:23 +00:00 committed by Karl Hobley
parent 55a045f723
commit 3191849b6b
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -80,7 +80,7 @@ We thank `BrowserStack <https://www.browserstack.com/>`_, 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
~~~~~~~~~~~~

2
docs/getting_started/integrating_into_django.rst
View File

@ -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

3
setup.py
View File

@ -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,