aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Finucane <stephen.finucane@intel.com>2015-12-05 03:53:00 +0000
committerStephen Finucane <stephen.finucane@intel.com>2016-01-19 21:55:24 +0000
commitc88c818519be7556e2bbfcbdf0211206f1a6c582 (patch)
tree067e03c2fea894ffdf85a0d1c0d07a3152ddaca3
parent0b3fc3f076f065dd705cf129e97e26fc018fc2c4 (diff)
downloadpatchwork-c88c818519be7556e2bbfcbdf0211206f1a6c582.tar
patchwork-c88c818519be7556e2bbfcbdf0211206f1a6c582.tar.gz
tox: Cleanup file
Remove some unnecessary code and reorder in a logical fashion Signed-off-by: Stephen Finucane <stephen.finucane@intel.com>
-rw-r--r--tox.ini9
1 files changed, 3 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini
index ad5f3a5..2b19d3c 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