From febad055fb6609369f1a465a5eec323549c5c065 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 31 Oct 2016 18:23:29 +0000 Subject: [PATCH] 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 --- patchwork/settings/dev.py | 3 +-- requirements-dev.txt | 2 ++ requirements-prod.txt | 2 ++ requirements-test.txt | 2 -- tox.ini | 4 ++++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/patchwork/settings/dev.py b/patchwork/settings/dev.py index a084d6a1..cb51b107 100644 --- 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 f516fade..fdfe00cb 100644 --- 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 d189ad42..57e6fce2 100644 --- 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 b27055ff..aa756f5a 100644 --- 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 e55e3bd9..d68588a3 100644 --- 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 -- 2.47.3