Remove support for Django 2.1 (#5840)

.travis.yml

@@ -7,13 +7,11 @@ addons:
 
 matrix:
   include:
-   - env: TOXENV=py35-dj21-mysql-noelasticsearch
+   - env: TOXENV=py35-dj22-mysql-noelasticsearch
      python: 3.5
-   - env: TOXENV=py36-dj21-postgres-noelasticsearch
+   - env: TOXENV=py36-dj22-postgres-noelasticsearch
      python: 3.6
-   - env: TOXENV=py37-dj21-sqlite-noelasticsearch
-     python: 3.7
-   - env: TOXENV=py37-dj22-postgres-noelasticsearch
+   - env: TOXENV=py37-dj22-sqlite-noelasticsearch
      python: 3.7
    - env: TOXENV=py37-dj30-sqlite-noelasticsearch
      python: 3.7
@@ -25,27 +23,21 @@ matrix:
      python: 3.8
    - env: TOXENV=py38-djmaster-postgres-noelasticsearch
      python: 3.8
-   - env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
+   - env: TOXENV=py36-dj22-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
      python: 3.6
-   - env: TOXENV=py36-dj21-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
-     python: 3.6
-   - env: TOXENV=py36-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
+   - env: TOXENV=py36-dj22-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
      python: 3.6
    - env: TOXENV=py37-dj22-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
      python: 3.7
-   - env: TOXENV=py37-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
-     python: 3.7
    - env: TOXENV=py38-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
      python: 3.8
    - env: TOXENV=py38-dj30-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
      python: 3.8
   allow_failures:
     # Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky
-    - env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
-    - env: TOXENV=py36-dj21-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
-    - env: TOXENV=py36-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
+    - env: TOXENV=py36-dj22-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
+    - env: TOXENV=py36-dj22-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
     - env: TOXENV=py37-dj22-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
-    - env: TOXENV=py37-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
     - env: TOXENV=py38-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
     - env: TOXENV=py38-dj30-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
     # allow failures against Django 3.0.x stable branch

CHANGELOG.txt

@@ -4,6 +4,7 @@ Changelog
 2.9 (xx.xx.xxxx) - IN DEVELOPMENT
 ~~~~~~~~~~~~~~~~
 
+ * Removed support for Django 2.1
  * Skip page validation when unpublishing a page (Samir Shah)
  * Added `MultipleChoiceBlock` block type for StreamField (James O'Toole)
  * ChoiceBlock now accepts a `widget` keyword argument (James O'Toole)

README.md

@@ -56,7 +56,7 @@ _(If you are reading this on GitHub, the details here may not be indicative of t
 
 Wagtail supports:
 
-* Django 2.1.x, 2.2.x and 3.0.x
+* Django 2.2.x and 3.0.x
 * Python 3.5, 3.6, 3.7 and 3.8
 * PostgreSQL, MySQL and SQLite as database backends
 

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.1, 2.2 and 3.0. First, install the ``wagtail`` package from PyPI:
+Wagtail is currently compatible with Django 2.2 and 3.0. First, install the ``wagtail`` package from PyPI:
 
 .. code-block:: console
 

docs/releases/2.9.rst

@@ -38,6 +38,12 @@ Bug fixes
 Upgrade considerations
 ======================
 
+Removed support for Django 2.1
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Django 2.1 is no longer supported as of this release; please upgrade to Django 2.2 or above before upgrading Wagtail.
+
+
 ``SiteMiddleware`` and ``request.site`` deprecated
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

docs/releases/upgrading.rst

@@ -133,5 +133,5 @@ The compatible versions of Django and Python for each Wagtail release are:
 +-------------------+------------------------------+-----------------------------+
 | 2.8               | 2.1, 2.2, 3.0                | 3.5, 3.6, 3.7, 3.8          |
 +-------------------+------------------------------+-----------------------------+
-| 2.9               | 2.1, 2.2, 3.0                | 3.5, 3.6, 3.7, 3.8          |
+| 2.9               | 2.2, 3.0                     | 3.5, 3.6, 3.7, 3.8          |
 +-------------------+------------------------------+-----------------------------+

setup.py

@@ -98,7 +98,6 @@ https://github.com/wagtail/wagtail/.",
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Framework :: Django',
-        'Framework :: Django :: 2.1',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
         'Framework :: Wagtail',

tox.ini

@@ -2,7 +2,7 @@
 skipsdist = True
 usedevelop = True
 
-envlist = py{35,36,37}-dj{21,22,30,30stable,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
+envlist = py{35,36,37}-dj{22,30,30stable,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
 
 [testenv]
 install_command = pip install -e ".[testing]" -U {opts} {packages}
@@ -23,7 +23,6 @@ deps =
     django-sendfile==0.3.6
     Embedly
 
-    dj21: Django>=2.1,<2.2
     dj22: Django>=2.2,<2.3
     dj30: Django>=3.0,<3.1
     dj30stable: git+https://github.com/django/django.git@stable/3.0.x#egg=Django