Skip to content

Commit 543779f

Browse files
committed
tox: generic twisted factor
1 parent 2ade3d5 commit 543779f

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

tox.ini

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ commands =
2626
coverage: coverage report
2727
passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS
2828
setenv =
29-
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_PEXPECT:} {env:_PYTEST_TOX_POSARGS_XDIST:}
29+
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_PEXPECT:} {env:_PYTEST_TOX_POSARGS_TWISTED:} {env:_PYTEST_TOX_POSARGS_XDIST:}
3030

3131
# Configuration to run with coverage similar to Travis/Appveyor, e.g.
3232
# "tox -e py37-coverage".
@@ -42,12 +42,16 @@ setenv =
4242
pexpect: _PYTEST_TOX_PLATFORM=linux|darwin
4343
pexpect: _PYTEST_TOX_POSARGS_PEXPECT=testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py
4444

45+
twisted: _PYTEST_TOX_POSARGS_TWISTED=testing/test_unittest.py
46+
4547
xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto
4648
extras = testing
4749
deps =
4850
numpy: numpy
4951
pexpect: pexpect
5052
pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master
53+
twisted: twisted
54+
twisted: unittest2
5155
xdist: pytest-xdist>=1.13
5256
{env:_PYTEST_TOX_EXTRA_DEP:}
5357
platform = {env:_PYTEST_TOX_PLATFORM:.*}
@@ -67,18 +71,6 @@ basepython = python3
6771
deps = pre-commit>=1.11.0
6872
commands = pre-commit run --all-files --show-diff-on-failure
6973

70-
[testenv:py27-twisted]
71-
deps =
72-
{[testenv]deps}
73-
twisted
74-
unittest2
75-
commands =
76-
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/test_unittest.py}
77-
78-
[testenv:py37-twisted]
79-
deps = {[testenv:py27-twisted]deps}
80-
commands = {[testenv:py27-twisted]commands}
81-
8274
[testenv:docs]
8375
basepython = python3
8476
skipsdist = True

0 commit comments

Comments
 (0)