Skip to content

Commit bd8a2cc

Browse files
committed
removing pexpect from general dependencies because
it doesn't install on windows anymore. Instead to specific configurations for pexpect on py27 and py33 which only call the tests that need it.
1 parent 6d1b7e9 commit bd8a2cc

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

tox.ini

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
[tox]
22
distshare={homedir}/.tox/distshare
3-
envlist=flakes,py25,py26,py27,pypy,py27-nobyte,py32,py33,py27-xdist,py33-xdist,trial
3+
envlist=flakes,py25,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,trial
44

55
[testenv]
66
changedir=testing
77
commands= py.test --lsof -rfsxX --junitxml={envlogdir}/junit-{envname}.xml []
88
deps=
9-
pexpect
109
nose
1110

1211
[testenv:genscript]
@@ -41,6 +40,20 @@ commands=
4140
py.test -n3 -rfsxX \
4241
--junitxml={envlogdir}/junit-{envname}.xml testing
4342

43+
[testenv:py27-pexpect]
44+
changedir=testing
45+
basepython=python2.7
46+
deps=pexpect
47+
commands=
48+
py.test -rfsxX test_pdb.py test_terminal.py test_unittest.py
49+
50+
[testenv:py33-pexpect]
51+
changedir=testing
52+
basepython=python2.7
53+
deps={[testenv:py27-pexpect]deps}
54+
commands=
55+
py.test -rfsxX test_pdb.py test_terminal.py test_unittest.py
56+
4457
[testenv:py27-nobyte]
4558
changedir=.
4659
basepython=python2.7
@@ -55,7 +68,6 @@ commands=
5568
[testenv:trial]
5669
changedir=.
5770
deps=twisted
58-
pexpect
5971
commands=
6072
py.test -rsxf \
6173
--junitxml={envlogdir}/junit-{envname}.xml {posargs:testing/test_unittest.py}

0 commit comments

Comments
 (0)