From a3283dd7fb6e7b96277c4b70ff98d4aa4f82322b Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 1 Apr 2019 18:56:31 +0100 Subject: [PATCH] Formalise support for Django 2.2 --- .travis.yml | 33 ++++++++++--------- CHANGELOG.txt | 1 + README.md | 2 +- .../integrating_into_django.rst | 2 +- docs/releases/2.5.rst | 6 ++++ docs/releases/upgrading.rst | 2 ++ setup.py | 3 +- tox.ini | 3 +- 8 files changed, 33 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1711a53f50..e3c252818c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,27 +11,30 @@ matrix: python: 3.4 - env: TOXENV=py35-dj20-sqlite-noelasticsearch python: 3.5 - - env: TOXENV=py35-dj21-sqlite-noelasticsearch - python: 3.5 - env: TOXENV=py35-dj21-mysql-noelasticsearch python: 3.5 - env: TOXENV=py36-dj20-postgres-noelasticsearch python: 3.6 - env: TOXENV=py36-dj21-postgres-noelasticsearch python: 3.6 - - env: TOXENV=py37-dj20-mysql-noelasticsearch - python: 3.7 - dist: xenial - env: TOXENV=py37-dj21-postgres-noelasticsearch python: 3.7 dist: xenial - - env: TOXENV=py37-dj21-sqlite-noelasticsearch + - env: TOXENV=py37-dj22-sqlite-noelasticsearch + python: 3.7 + dist: xenial + - env: TOXENV=py37-dj22-mysql-noelasticsearch + python: 3.7 + dist: xenial + - env: TOXENV=py37-dj22-postgres-noelasticsearch + python: 3.7 + dist: xenial + - env: TOXENV=py37-dj22stable-postgres-noelasticsearch + python: 3.7 + dist: xenial + - env: TOXENV=py37-djmaster-postgres-noelasticsearch python: 3.7 dist: xenial - - env: TOXENV=py36-dj22-postgres-noelasticsearch - python: 3.6 - - env: TOXENV=py36-djmaster-postgres-noelasticsearch - python: 3.6 - env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes python: 3.6 - env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes @@ -42,7 +45,7 @@ matrix: python: 3.6 - env: TOXENV=py36-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes python: 3.6 - - env: TOXENV=py37-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes + - env: TOXENV=py37-dj22-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes python: 3.7 dist: xenial allow_failures: @@ -52,11 +55,11 @@ matrix: - env: TOXENV=py36-dj21-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes - env: TOXENV=py36-dj20-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes - env: TOXENV=py36-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes - - env: TOXENV=py37-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes - # allow failures against Django 2.2 while support is still being worked on - - env: TOXENV=py36-dj22-postgres-noelasticsearch + - env: TOXENV=py37-dj22-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes + # allow failures against Django 2.2.x stable branch + - env: TOXENV=py37-dj22stable-postgres-noelasticsearch # allow failures against Django master - - env: TOXENV=py36-djmaster-postgres-noelasticsearch + - env: TOXENV=py37-djmaster-postgres-noelasticsearch # Services services: diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 2c5425d211..1437726345 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,7 @@ Changelog 2.5 (xx.xx.xxxx) - IN DEVELOPMENT ~~~~~~~~~~~~~~~~ + * Django 2.2 support (Matt Westcott, Andy Babic) * Added support for customising EditHandler-based forms on a per-request basis (Bertrand Bordage) * Added more informative error message when `|richtext` filter is applied to a non-string value (mukesh5) * Automatic search indexing can now be disabled on a per-model basis via the `search_auto_update` attribute (Karl Hobley) diff --git a/README.md b/README.md index 836527fe20..7b85842bb2 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Wagtail is used by NASA, Google, Oxfam, the NHS, Mozilla, MIT, the Red Cross, Sa Wagtail supports: -* Django 2.0.x and 2.1.x +* Django 2.0.x, 2.1.x and 2.2.x * Python 3.4, 3.5, 3.6 and 3.7 * PostgreSQL, MySQL and SQLite as database backends diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index 649eae029a..a840d44e68 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 and 2.1. First, install the ``wagtail`` package from PyPI: +Wagtail is currently compatible with Django 2.0, 2.1 and 2.2. First, install the ``wagtail`` package from PyPI: .. code-block:: console diff --git a/docs/releases/2.5.rst b/docs/releases/2.5.rst index 0b8adcc109..385314152a 100644 --- a/docs/releases/2.5.rst +++ b/docs/releases/2.5.rst @@ -10,6 +10,12 @@ Wagtail 2.5 release notes - IN DEVELOPMENT What's new ========== +Django 2.2 support +~~~~~~~~~~~~~~~~~~ + +This release is compatible with Django 2.1. Compatibility fixes were contributed by Matt Westcott and Andy Babic. + + New Markdown shortcuts in rich text ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/releases/upgrading.rst b/docs/releases/upgrading.rst index 899c756ec2..3db1dfae1f 100644 --- a/docs/releases/upgrading.rst +++ b/docs/releases/upgrading.rst @@ -141,4 +141,6 @@ The compatible versions of Django and Python for each Wagtail release are: +-------------------+------------------------------+-----------------------------+ | 2.4 | 2.0, 2.1 | 3.4, 3.5, 3.6, 3.7 | +-------------------+------------------------------+-----------------------------+ +| 2.5 | 2.0, 2.1, 2.2 | 3.4, 3.5, 3.6, 3.7 | ++-------------------+------------------------------+-----------------------------+ diff --git a/setup.py b/setup.py index fe58577389..e710a90652 100755 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ except ImportError: install_requires = [ - "Django>=2.0,<2.2", + "Django>=2.0,<2.3", "django-modelcluster>=4.2,<5.0", "django-taggit>=0.23,<0.24", "django-treebeard>=4.2.0,<5.0", @@ -95,6 +95,7 @@ https://github.com/wagtail/wagtail/.", 'Framework :: Django', 'Framework :: Django :: 2.0', 'Framework :: Django :: 2.1', + 'Framework :: Django :: 2.2', 'Framework :: Wagtail', 'Topic :: Internet :: WWW/HTTP :: Site Management', ], diff --git a/tox.ini b/tox.ini index b6a336e4bc..8869d501df 100644 --- a/tox.ini +++ b/tox.ini @@ -44,7 +44,8 @@ deps = dj20: Django>=2.0,<2.1 dj21: Django>=2.1,<2.2 - dj22: git+https://github.com/django/django.git@stable/2.2.x#egg=Django + dj22: Django>=2.2,<2.3 + dj22stable: git+https://github.com/django/django.git@stable/2.2.x#egg=Django djmaster: git+https://github.com/django/django.git@master#egg=Django postgres: psycopg2>=2.6