Revert "Remove Django 2.0 support"

This reverts commit f09bfd460814d7125437b0b45a183a221692584a.

diff --git a/README.rst b/README.rst
index f5fc1d1aba7600ffa31473edabdfc882bf225000..495cc2bd78621a71b220feaeaaedf5e81fdb3f16 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -39,7 +39,7 @@ Requirements
 
 - Python (2.7, 3.5 - 3.8)
 
-- Django (1.11, 2.1 - 2.2)
+- Django (1.11 - 2.2)
 
 - Django REST Framework (3.6 - 3.9)
 

diff --git a/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml b/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
deleted file mode 100644 (file)
index 58a1273..0000000
--- a/releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-upgrade:
-  - |
-    Django 2.0 is no longer supported. It is no longer supported upstream.

diff --git a/tox.ini b/tox.ini
index 397a1c52745a80459940a2a6e1efcddb0eaf8a19..140c19246dd162d4200f50ade3542868e90e5bad 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,21,22}
+envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,20,21,22}
 skipsdist = True
 
 [testenv]
@@ -11,9 +11,10 @@ deps =
     django111: djangorestframework>=3.6,<3.10; python_version < '3.0'
     django111: django-filter>=1.0,<3.0; python_version >= '3.5'
     django111: django-filter>=1.0,<2.0; python_version < '3.0'
+    django20: django>=2.0,<2.1
     django21: django>=2.1,<2.2
-    django21: djangorestframework>=3.7,<3.11
-    django21: django-filter>=2.0,<3.0
+    django{20,21}: djangorestframework>=3.7,<3.11
+    django{20,21}: django-filter>=2.0,<3.0
     django22: django>=2.2,<2.3
     django22: djangorestframework>=3.10,<3.11
     django22: django-filter>=2.1,<3.0