requirements: Test older versions of DRF

We still care about Django 1.6 and 1.7, at least until 2.0 is released.
Start testing REST functionality on these versions by using older
versions.

Signed-off-by: Stephen Finucane <stephen@that.guru>

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

diff --git a/requirements-dev.txt b/requirements-dev.txt
index f516faded4a0186c925df20e91b9b557930b264f..fdfe00cb63d0adc98c21c413a5895925bb57ebb2 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,2 +1,4 @@
 Django>=1.8,<1.11
+djangorestframework>=3.5,<3.6
+drf-nested-routers>=0.11.1,<0.12
 -r requirements-test.txt

diff --git a/requirements-prod.txt b/requirements-prod.txt
index d189ad424a2a5adfa10ab89bd65df96df3ce9153..57e6fce2d52604c664276739f7e7b2836abe9300 100644 (file)
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -1,3 +1,5 @@
 Django>=1.8,<1.11
+djangorestframework>=3.5,<3.6
+drf-nested-routers>=0.11.1,<0.12
 psycopg2>2.6,<2.7
 sqlparse

diff --git a/requirements-test.txt b/requirements-test.txt
index b27055ff2f04d9ccdbe5edee4dacc2caa369389b..aa756f5ae261d39df252603b41ca609a9948d1db 100644 (file)
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -2,5 +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
-djangorestframework>=3.5,<3.6
-drf-nested-routers>=0.11.1,<0.12

diff --git a/tox.ini b/tox.ini
index e55e3bd97bdca98c04020f432d934e6b243ed6b5..d68588a3d8f8925f1d477da804e6cf4ddddd830b 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -7,10 +7,14 @@ 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
+    drf-nested-routers>=0.11.1,<0.12
 setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
     PYTHONDONTWRITEBYTECODE = 1