Jelajahi Sumber

Update setup.py and docs to mention Django 2.0 support

Matt Westcott 7 tahun lalu
induk
melakukan
3191849b6b
3 mengubah file dengan 4 tambahan dan 3 penghapusan
  1. 1 1
      README.rst
  2. 1 1
      docs/getting_started/integrating_into_django.rst
  3. 2 1
      setup.py

+ 1 - 1
README.rst

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

+ 1 - 1
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
 

+ 2 - 1
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,