From c1c3f73c0a98996e1347353864e9367ac69edf33 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephen.finucane@intel.com>
Date: Fri, 21 Aug 2015 15:32:06 +0100
Subject: [PATCH] tox: Update versions of Django to be tested

Since patchwork now supports Django 1.8 and no longer support 1.5, it
is necessary to update the tox targets to validate this new subset of
supported Django versions.

In addition, the paths to the requirements.txt files were not updated
as part of a rebase. Correct this oversight.

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Stephen Finucane <stephen.finucane@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 docs/requirements-base.txt |  2 +-
 docs/requirements-prod.txt |  2 +-
 tox.ini                    | 42 ++++++++++++++++++++------------------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/docs/requirements-base.txt b/docs/requirements-base.txt
index 77dc8295..58b34ec5 100644
--- a/docs/requirements-base.txt
+++ b/docs/requirements-base.txt
@@ -1,2 +1,2 @@
+MySQL-python==1.2.5
 python-dateutil==1.5
-Django<1.8,>=1.7
diff --git a/docs/requirements-prod.txt b/docs/requirements-prod.txt
index 24f97ceb..f2c440a7 100644
--- a/docs/requirements-prod.txt
+++ b/docs/requirements-prod.txt
@@ -1,2 +1,2 @@
-MySQL-python==1.2.5
+Django<1.9,>=1.8
 -r requirements-base.txt
diff --git a/tox.ini b/tox.ini
index 485f7c7a..891fc5ec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,27 @@
 [tox]
-envlist = {py27}-django{15,16,17}, pep8
+minversion = 1.6
+envlist = {py27}-django{16,17,18}
 skipsdist = True
 
+[testenv]
+basepython =
+    py27: python2.7
+deps =
+    -r{toxinidir}/docs/requirements-dev.txt
+    django16: django>=1.6,<1.7
+    django17: django>=1.7,<1.8
+    django18: django>=1.8,<1.9
+setenv =
+    DJANGO_SETTINGS_MODULE = patchwork.settings.dev
+commands =
+    {toxinidir}/manage.py test '{posargs:patchwork}'
+passenv =
+    http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
+    PW_TEST_DB_USER PW_TEST_DB_PASS
+
 [testenv:pep8]
-deps = flake8
+basepython = python2.7
+deps = flake
 commands = flake8 {posargs}
 
 [flake8]
@@ -14,33 +32,17 @@ exclude = ./patchwork/tests
 basepython = python2.7
 deps =
     pylint
-    -r{toxinidir}/docs/requirements-django-1.7-mysql.txt
+    -r{toxinidir}/docs/requirements-prod.txt
 commands = pylint patchwork --rcfile=pylint.rc
 
 [testenv:coverage]
 basepython = python2.7
 deps =
     coverage
-    -r{toxinidir}/docs/requirements-django-1.6-mysql.txt
+    -r{toxinidir}/docs/requirements-prod.txt
 setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
 commands =
     coverage erase
-    {toxinidir}/manage.py syncdb
     coverage run --omit=*tox* --branch {toxinidir}/manage.py test patchwork
     coverage report -m
-
-[testenv]
-basepython =
-    py27: python2.7
-commands =
-    {toxinidir}/manage.py syncdb
-    {toxinidir}/manage.py test patchwork
-deps =
-    python-dateutil==1.5
-    MySQL-python==1.2.5
-    django15: django<1.6,>=1.5
-    django16: django<1.7,>=1.6
-    django17: django<1.8,>=1.7
-setenv =
-    DJANGO_SETTINGS_MODULE = patchwork.settings.dev
-- 
2.47.3