From: Stephen Finucane <stephen@that.guru>
Date: Sun, 22 Jan 2017 22:33:51 +0000 (+0000)
Subject: Revert "requirements: Test older versions of DRF"
X-Git-Tag: v2.0.0-rc1~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f2ddab6;p=thirdparty%2Fpatchwork.git

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 cb51b107..a084d6a1 100644
--- 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 55713eff..aa756f5a 100644
--- 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 c5a93496..319a8c70 100644
--- 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