X-Git-Url: https://git.ozlabs.org/?p=patchwork;a=blobdiff_plain;f=tox.ini;h=891fc5ec2499d484181406a1e63967e4ecacdbfc;hp=485f7c7acfa292847ab297e442fce0f11f3eba24;hb=c1c3f73c0a98996e1347353864e9367ac69edf33;hpb=6b80f4fd8d654055127872350b8667315e7a54d7;ds=sidebyside

diff --git a/tox.ini b/tox.ini
index 485f7c7..891fc5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,27 @@
 [tox]
-envlist = {py27}-django{15,16,17}, pep8
+minversion = 1.6
+envlist = {py27}-django{16,17,18}
 skipsdist = True
 
+[testenv]
+basepython =
+    py27: python2.7
+deps =
+    -r{toxinidir}/docs/requirements-dev.txt
+    django16: django>=1.6,<1.7
+    django17: django>=1.7,<1.8
+    django18: django>=1.8,<1.9
+setenv =
+    DJANGO_SETTINGS_MODULE = patchwork.settings.dev
+commands =
+    {toxinidir}/manage.py test '{posargs:patchwork}'
+passenv =
+    http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
+    PW_TEST_DB_USER PW_TEST_DB_PASS
+
 [testenv:pep8]
-deps = flake8
+basepython = python2.7
+deps = flake
 commands = flake8 {posargs}
 
 [flake8]
@@ -14,33 +32,17 @@ exclude = ./patchwork/tests
 basepython = python2.7
 deps =
     pylint
-    -r{toxinidir}/docs/requirements-django-1.7-mysql.txt
+    -r{toxinidir}/docs/requirements-prod.txt
 commands = pylint patchwork --rcfile=pylint.rc
 
 [testenv:coverage]
 basepython = python2.7
 deps =
     coverage
-    -r{toxinidir}/docs/requirements-django-1.6-mysql.txt
+    -r{toxinidir}/docs/requirements-prod.txt
 setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
 commands =
     coverage erase
-    {toxinidir}/manage.py syncdb
     coverage run --omit=*tox* --branch {toxinidir}/manage.py test patchwork
     coverage report -m
-
-[testenv]
-basepython =
-    py27: python2.7
-commands =
-    {toxinidir}/manage.py syncdb
-    {toxinidir}/manage.py test patchwork
-deps =
-    python-dateutil==1.5
-    MySQL-python==1.2.5
-    django15: django<1.6,>=1.5
-    django16: django<1.7,>=1.6
-    django17: django<1.8,>=1.7
-setenv =
-    DJANGO_SETTINGS_MODULE = patchwork.settings.dev