diff --git a/tox.ini b/tox.ini index 7216bc308..32336f20e 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ minversion=2.0 distshare={homedir}/.tox/distshare envlist= flakes,py26,py27,py33,py34,py35,pypy, - {py27,py34}-{pexpect,xdist,trial}, + {py27,py35}-{pexpect,xdist,trial}, py27-nobyte,doctesting,py27-cxfreeze [testenv] @@ -43,7 +43,7 @@ deps=pytest-xdist>=1.13 commands= py.test -n1 -rfsxX {posargs:testing} -[testenv:py34-xdist] +[testenv:py35-xdist] deps={[testenv:py27-xdist]deps} commands= py.test -n3 -rfsxX {posargs:testing} @@ -55,7 +55,7 @@ deps=pexpect commands= py.test -rfsxX test_pdb.py test_terminal.py test_unittest.py -[testenv:py34-pexpect] +[testenv:py35-pexpect] changedir=testing platform=linux|darwin deps={[testenv:py27-pexpect]deps} @@ -75,8 +75,7 @@ deps=twisted commands= py.test -rsxf {posargs:testing/test_unittest.py} -[testenv:py34-trial] -# py34-trial does not work +[testenv:py35-trial] platform=linux|darwin deps={[testenv:py27-trial]deps} commands=