Skip to content

Commit

Permalink
tox: Cleanup file
Browse files Browse the repository at this point in the history
Remove some unnecessary code and reorder in a logical fashion

v2: Port to fdo's patchwork (Damien)

Signed-off-by: Stephen Finucane <stephen.finucane@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
  • Loading branch information
stephenfin authored and Damien Lespiau committed Feb 18, 2016
1 parent c64dfc9 commit f2ddfce
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ envlist = {py27}-django{16,17,18}
skipsdist = True

[testenv]
basepython =
py27: python2.7
deps =
-r{toxinidir}/docs/requirements-dev.txt
MySQL-python==1.2.5
Expand All @@ -14,12 +12,12 @@ deps =
django18: django>=1.8,<1.9
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
commands =
{toxinidir}/manage.py test --noinput --liveserver=localhost:9000-9200 \
'{posargs:patchwork}'

[testenv:pep8]
basepython = python2.7
Expand Down

0 comments on commit f2ddfce

Please sign in to comment.