Revert "requirements: Test older versions of DRF"

This partially reverts commit febad055fb6609369f1a465a5eec323549c5c065.
While Django REST Framework works with Django 1.6 and 1.7, the versions
of Django Filters that provide DRF integration do not [1]. It doesn't
really make sense to enable only partial REST API support (i.e. no
filtering) for users with older Django versions and this approach will
cause far too much confusion among users. Better to just drop REST API
support for users with these insecure versions and encourage them to
update to supported versions of Django should they wish to use these
features.

[1] https://github.com/carltongibson/django-filter/blob/0.15.0/CHANGES.rst

Signed-off-by: Stephen Finucane <stephen@that.guru>
Fixes: 0fc32337 ("REST: Integrate django-filter support")

diff --git a/patchwork/settings/dev.py b/patchwork/settings/dev.py
index cb51b107144ce57b2265ea2225d7af9741b57283..a084d6a17caac83a15dd27ff2ed6639afdf44e07 100644 (file)
--- a/patchwork/settings/dev.py
+++ b/patchwork/settings/dev.py
@@ -89,4 +89,5 @@ if django.VERSION >= (1, 8):
 
 ENABLE_XMLRPC = True
 
-ENABLE_REST_API = True
+if django.VERSION >= (1, 8):
+    ENABLE_REST_API = True

diff --git a/requirements-test.txt b/requirements-test.txt
index 55713effed46cc0ec0c5e2a9d90a5e8fe702bf8b..aa756f5ae261d39df252603b41ca609a9948d1db 100644 (file)
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -2,4 +2,3 @@ mysqlclient>=1.3,<1.4  # replace this with psycopg2 for a PostgreSQL backend
 django-debug-toolbar==1.6
 python-dateutil>2.0,<3.0
 selenium>=3.0,<3.1
-django-filter>=1.0,<1.1

diff --git a/tox.ini b/tox.ini
index c5a934963f3c005bbf50d638da6a9029096e3d5e..319a8c70f5196c136f071ba628245b02fbbc1001 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -7,13 +7,12 @@ skipsdist = True
 deps =
     -r{toxinidir}/requirements-test.txt
     django16: django>=1.6,<1.7
-    django16: djangorestframework>=3.2,<3.3
     django17: django>=1.7,<1.8
-    django17: djangorestframework>=3.3,<3.4
     django18: django>=1.8,<1.9
     django19: django>=1.9,<1.10
     django110: django>=1.10,<1.11
     django{18,19,110}: djangorestframework>=3.5,<3.6
+    django{18,19,110}: django-filter>=1.0,<1.1
 setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
     PYTHONDONTWRITEBYTECODE = 1