From: Stephen Finucane <stephen.finucane@intel.com>
Date: Sat, 5 Dec 2015 03:53:00 +0000 (+0000)
Subject: tox: Cleanup file
X-Git-Tag: v1.1.0~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c88c818519be7556e2bbfcbdf0211206f1a6c582;p=thirdparty%2Fpatchwork.git

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 ad5f3a51..2b19d3c7 100644
--- 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