From a6599c6ece25c0fdc07442394504631c07e4ba29 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Mon, 5 Dec 2011 17:21:25 +0100
Subject: [PATCH] Moved tox file in root again to help Shining Panda.

---
 tests/tox.ini => tox.ini | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
 rename tests/tox.ini => tox.ini (94%)

diff --git a/tests/tox.ini b/tox.ini
similarity index 94%
rename from tests/tox.ini
rename to tox.ini
index 83d177e..a3940a5 100644
--- a/tests/tox.ini
+++ b/tox.ini
@@ -1,17 +1,14 @@
-[tox]
-setupdir = ..
-
 [testenv]
 commands =
     {envbindir}/python {envbindir}/django-admin.py jenkins {posargs:tests}
 downloadcache = {toxworkdir}/_download/
 distribute = false
 setenv =
-    PYTHONPATH = {toxinidir}/..
+    PYTHONPATH = {toxinidir}
     DJANGO_SETTINGS_MODULE = tests.settings
 
 [testenv:docs]
-changedir = ../docs
+changedir = docs
 deps =
     Sphinx
 commands =