From 989dc261fd273ec12c6bc82d09e40836b75bc56a Mon Sep 17 00:00:00 2001
From: Michael Ford <mtford@gmail.com>
Date: Wed, 8 Apr 2015 08:43:34 +0100
Subject: [PATCH] fix tox tests

---
 requirements.txt            | 4 ++--
 tests/test-requirements.txt | 5 +++--
 tox.ini                     | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 95a6061c..b1c56590 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 Django==1.6.8
-Pygments==1.6
+Pygments>=2.0,<2.1
 six==1.6.0
 simplejson==3.1.2
-python-dateutil==2.2
+python-dateutil>=2.4,<2.5
 requests==2.2.1
 sqlparse==0.1.11
 Jinja2==2.7.2
diff --git a/tests/test-requirements.txt b/tests/test-requirements.txt
index 92a9c6cd..46d5c7e1 100644
--- a/tests/test-requirements.txt
+++ b/tests/test-requirements.txt
@@ -1,7 +1,7 @@
-Pygments==1.6
+Pygments>=2.0,<2.1
 six==1.6.0
 simplejson==3.1.2
-python-dateutil==2.2
+python-dateutil>=2.4,<2.5
 requests==2.2.1
 sqlparse==0.1.11
 Jinja2==2.7.2
@@ -9,3 +9,4 @@ autopep8==1.0.2
 pytz>2014.2
 mock==1.0.1
 Pillow==2.5.1
+nose
diff --git a/tox.ini b/tox.ini
index 7f614fed..07866716 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,9 +2,9 @@
 envlist = py{27,34}-django{15,16,17}
 
 [testenv]
-commands = {toxinidir}/tests/manage.py test
+commands = nosetests {toxinidir}/tests/tests
 setenv =
-    DJANGO_SETTINGS_MODULE=settings
+    DJANGO_SETTINGS_MODULE=tests.settings
     PYTHONPATH={toxinidir}/tests
 
 deps =