From 62c0c013047abf797561c3f88dffab045ab23337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Bryon?= <benoit@marmelune.net>
Date: Fri, 12 Jun 2015 20:36:17 +0200
Subject: [PATCH] Refs #98 - Workaround travis and test requirements.

---
 .travis.yml | 17 +++++++++++++----
 setup.py    |  6 +-----
 tox.ini     |  3 ++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c3c57cf..b207d50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,20 @@
 language: python
 env:
-  - TOXENV=py27
-  - TOXENV=py33
+  - TOXENV=py27-django15
+  - TOXENV=py27-django16
+  - TOXENV=py27-django17
+  - TOXENV=py27-django18
+  - TOXENV=py33-django15
+  - TOXENV=py33-django16
+  - TOXENV=py33-django17
+  - TOXENV=py33-django18
+  - TOXENV=py34-django15
+  - TOXENV=py34-django16
+  - TOXENV=py34-django17
+  - TOXENV=py34-django18
   - TOXENV=flake8
   - TOXENV=sphinx
   - TOXENV=readme
 install:
-  - pip install tox
 script:
-  - tox
+  - make test
diff --git a/setup.py b/setup.py
index 97b2f15..d7e924f 100644
--- a/setup.py
+++ b/setup.py
@@ -62,11 +62,7 @@ REQUIREMENTS = [
 ]
 ENTRY_POINTS = {}
 SETUP_REQUIREMENTS = ['setuptools']
-TEST_REQUIREMENTS = [
-    'tox'
-]
-if IS_PYTHON2:
-    TEST_REQUIREMENTS.append('mock')
+TEST_REQUIREMENTS = ['tox']
 CMDCLASS = {'test': Tox}
 EXTRA_REQUIREMENTS = {
     'test': TEST_REQUIREMENTS,
diff --git a/tox.ini b/tox.ini
index 2d75daf..7e3a0b9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,11 +8,12 @@ basepython =
     py34: python3.4
 deps =
     coverage
-    nose
     django15: Django>=1.5,<1.6
     django16: Django>=1.6,<1.7
     django17: Django>=1.7,<1.8
     django18: Django>=1.8,<1.9
+    nose
+    py27: mock
 commands =
     pip install -e .
     pip install -e demo