Skip to content

Commit e7dcb32

Browse files
committed
Use complex factor conditions in tox.ini
`!py26` would be nice but that wasn't introduced until 3.0.0rc1 and it seems polite to not depend on pre-release versions of tox.
1 parent 74bb9ee commit e7dcb32

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

tox.ini

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ envlist=
77

88
[testenv]
99
deps=
10-
pytest
1110
greenlet
12-
twisted
11+
py26: pytest<3.3
12+
py{27,34,35,36}: pytest
13+
py26: twisted<15.5
14+
py{27,34,35,36}: twisted
1315
qt5reactor: pytest-qt
1416
qt5reactor: qt5reactor
1517
qt5reactor: pytest-xvfb
@@ -20,14 +22,6 @@ setenv=
2022
commands=py.test --reactor={env:reactor_option} []
2123
sitepackages=False
2224

23-
[testenv:py26-defaultreactor]
24-
deps=
25-
pytest<3.3
26-
greenlet
27-
twisted<15.5
28-
commands=py.test []
29-
sitepackages=False
30-
3125
[testenv:linting]
3226
deps=flake8
3327
commands=flake8

0 commit comments

Comments
 (0)