tox: Cleanup file

Remove some unnecessary code and reorder in a logical fashion

Signed-off-by: Stephen Finucane <stephen.finucane@intel.com>

diff --git a/tox.ini b/tox.ini
index ad5f3a51eefbb4c86446e5c574f2fc9361140999..2b19d3c745ea35ae342eb9c6efa04edcd8794ae1 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -4,9 +4,6 @@ envlist = py{27,34}-django{16,17,18,19}
 skipsdist = True
 
 [testenv]
-basepython =
-    py27: python2.7
-    py34: python3.4
 deps =
     -r{toxinidir}/requirements-test.txt
     django16: django>=1.6,<1.7
@@ -15,13 +12,13 @@ deps =
     django19: django>=1.9,<1.10
 setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
-commands =
-    {toxinidir}/manage.py test --noinput --liveserver=localhost:9000-9200 \
-        '{posargs:patchwork}'
 passenv =
     http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
     PW_TEST_DB_USER PW_TEST_DB_PASS
     DISPLAY SELENIUM_BROWSER PW_SKIP_BROWSER_TESTS
+commands =
+    {toxinidir}/manage.py test --noinput --liveserver=localhost:9000-9200 \
+        '{posargs:patchwork}'
 
 [testenv:pep8]
 basepython = python2.7