Skip to content

Commit 2970c1d

Browse files
committed
tox: generic pluggymaster factor
1 parent ed68fcf commit 2970c1d

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

tox.ini

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,15 @@ 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+
# TODO: remove?!
46+
pluggymaster: _PYTEST_SETUP_SKIP_PLUGGY_DEP=1
47+
4548
xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto
4649
extras = testing
4750
deps =
4851
numpy: numpy
4952
pexpect: pexpect
53+
pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master
5054
xdist: pytest-xdist>=1.13
5155
{env:_PYTEST_TOX_EXTRA_DEP:}
5256
platform = {env:_PYTEST_TOX_PLATFORM:.*}
@@ -78,18 +82,6 @@ commands =
7882
deps = {[testenv:py27-trial]deps}
7983
commands = {[testenv:py27-trial]commands}
8084

81-
[testenv:py27-pluggymaster]
82-
setenv=
83-
{[testenv]setenv}
84-
_PYTEST_SETUP_SKIP_PLUGGY_DEP=1
85-
deps =
86-
{[testenv]deps}
87-
git+https://github.com/pytest-dev/pluggy.git@master
88-
89-
[testenv:py37-pluggymaster]
90-
setenv = {[testenv:py27-pluggymaster]setenv}
91-
deps = {[testenv:py27-pluggymaster]deps}
92-
9385
[testenv:docs]
9486
basepython = python3
9587
skipsdist = True

0 commit comments

Comments
 (0)