From 5a1cceced4a23d1f4759fb77d40a8382bbb71942 Mon Sep 17 00:00:00 2001
From: Piet Delport <pjdelport@gmail.com>
Date: Thu, 2 Aug 2012 12:23:21 +0200
Subject: [PATCH 1/2] Tox: Update for Django 1.4.

---
 tox.ini | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index 1585489..d4581a0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-        py2.6-django1.2,py2.6-django1.3,
-        py2.7-django1.2,py2.7-django1.3
+        py2.6-django1.2,py2.6-django1.3,py2.6-django1.4,
+        py2.7-django1.2,py2.7-django1.3,py2.7-django1.4,
 
 [testenv]
 commands = python -Wall setup.py test
@@ -12,7 +12,11 @@ deps = Django>=1.2,<1.3
 
 [testenv:py2.6-django1.3]
 basepython = python2.6
-deps = Django>=1.3
+deps = Django>=1.3,<1.4
+
+[testenv:py2.6-django1.4]
+basepython = python2.6
+deps = Django>=1.4,<1.5
 
 [testenv:py2.7-django1.2]
 basepython = python2.7
@@ -20,4 +24,8 @@ deps = Django>=1.2,<1.3
 
 [testenv:py2.7-django1.3]
 basepython = python2.7
-deps = Django>=1.3
+deps = Django>=1.3,<1.4
+
+[testenv:py2.7-django1.4]
+basepython = python2.7
+deps = Django>=1.4,<1.5

From 1c9e478cc9235195d831508e13b7169dda2303ac Mon Sep 17 00:00:00 2001
From: Piet Delport <pjdelport@gmail.com>
Date: Mon, 13 Aug 2012 13:09:35 +0200
Subject: [PATCH 2/2] Add SECRET_KEY to the test settings.

Running without a SECRET_KEY becomes a DeprecationWarning in Django 1.4,
and will start raising an ImproperlyConfigured error in Django 1.5.

Details: https://docs.djangoproject.com/en/1.4/releases/1.4/#secret-key-setting-is-required
---
 analytical/tests/settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/analytical/tests/settings.py b/analytical/tests/settings.py
index 05b2b6c..9c86335 100644
--- a/analytical/tests/settings.py
+++ b/analytical/tests/settings.py
@@ -12,3 +12,5 @@ DATABASES = {
 INSTALLED_APPS = [
     'analytical',
 ]
+
+SECRET_KEY = 'testing'