From 110101d96eec4598ec378a8a2bbc1c8316b0f303 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 17 Dec 2019 12:51:23 +0000 Subject: [PATCH] Make Django 3.0 support official --- CHANGELOG.txt | 1 + README.md | 4 ++-- docs/getting_started/integrating_into_django.rst | 2 +- docs/releases/2.8.rst | 5 +++++ docs/releases/upgrading.rst | 2 +- setup.py | 3 ++- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 9273ffc6e..e9367fc17 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,7 @@ Changelog 2.8 (xx.xx.xxxx) - IN DEVELOPMENT ~~~~~~~~~~~~~~~~ + * Django 3.0 support (Matt Westcott, Mads Jensen) * Removed support for Django 2.0 * Removed leftover Python 2.x compatibility code (Sergey Fedoseev) * Combine flake8 configurations (Sergey Fedoseev) diff --git a/README.md b/README.md index 5f06288a3..5bae74066 100644 --- a/README.md +++ b/README.md @@ -54,11 +54,11 @@ Wagtail is used by NASA, Google, Oxfam, the NHS, Mozilla, MIT, the Red Cross, Sa Wagtail supports: -* Django 2.0.x, 2.1.x and 2.2.x +* Django 2.1.x, 2.2.x and 3.0.x * Python 3.5, 3.6, 3.7 and 3.8 * PostgreSQL, MySQL and SQLite as database backends -Previous versions of Wagtail (1.13 and earlier) additionally supported Python 2.7 and Django 1.x. +[Previous versions of Wagtail](https://docs.wagtail.io/en/stable/releases/upgrading.html#compatible-django-python-versions) additionally supported Python 2.7 and Django 1.x. --- diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index 4d34688bc..5ae58f97e 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 2.0, 2.1 and 2.2. First, install the ``wagtail`` package from PyPI: +Wagtail is currently compatible with Django 2.1, 2.2 and 3.0. First, install the ``wagtail`` package from PyPI: .. code-block:: console diff --git a/docs/releases/2.8.rst b/docs/releases/2.8.rst index 46dbb0910..40d576b8f 100644 --- a/docs/releases/2.8.rst +++ b/docs/releases/2.8.rst @@ -10,6 +10,11 @@ Wagtail 2.8 release notes - IN DEVELOPMENT What's new ========== +Django 3.0 support +~~~~~~~~~~~~~~~~~~ + +This release is compatible with Django 3.0. Compatibility fixes were contributed by Matt Westcott and Mads Jensen. + Other features ~~~~~~~~~~~~~~ diff --git a/docs/releases/upgrading.rst b/docs/releases/upgrading.rst index 971e301a2..0e63ea593 100644 --- a/docs/releases/upgrading.rst +++ b/docs/releases/upgrading.rst @@ -131,5 +131,5 @@ The compatible versions of Django and Python for each Wagtail release are: +-------------------+------------------------------+-----------------------------+ | 2.7 LTS | 2.0, 2.1, 2.2 | 3.5, 3.6, 3.7, 3.8 | +-------------------+------------------------------+-----------------------------+ -| 2.8 | 2.1, 2.2 | 3.5, 3.6, 3.7, 3.8 | +| 2.8 | 2.1, 2.2, 3.0 | 3.5, 3.6, 3.7, 3.8 | +-------------------+------------------------------+-----------------------------+ diff --git a/setup.py b/setup.py index 2fb84fb35..35d824ccd 100755 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ except ImportError: install_requires = [ - "Django>=2.0,<2.3", + "Django>=2.1,<3.1", "django-modelcluster>=5.0,<6.0", "django-taggit>=1.0,<2.0", "django-treebeard>=4.2.0,<5.0", @@ -100,6 +100,7 @@ https://github.com/wagtail/wagtail/.", 'Framework :: Django', 'Framework :: Django :: 2.1', 'Framework :: Django :: 2.2', + 'Framework :: Django :: 3.0', 'Framework :: Wagtail', 'Topic :: Internet :: WWW/HTTP :: Site Management', ],