From 2970c1df24e8492a16fc4681cfb08aba4e7f7a36 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 3 Mar 2019 13:12:03 +0100 Subject: [PATCH] tox: generic pluggymaster factor --- tox.ini | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/tox.ini b/tox.ini index 1fc20cb5f..3f954e1d4 100644 --- a/tox.ini +++ b/tox.ini @@ -42,11 +42,15 @@ setenv = pexpect: _PYTEST_TOX_PLATFORM=linux|darwin pexpect: _PYTEST_TOX_POSARGS_PEXPECT=testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py + # TODO: remove?! + pluggymaster: _PYTEST_SETUP_SKIP_PLUGGY_DEP=1 + xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto extras = testing deps = numpy: numpy pexpect: pexpect + pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master xdist: pytest-xdist>=1.13 {env:_PYTEST_TOX_EXTRA_DEP:} platform = {env:_PYTEST_TOX_PLATFORM:.*} @@ -78,18 +82,6 @@ commands = deps = {[testenv:py27-trial]deps} commands = {[testenv:py27-trial]commands} -[testenv:py27-pluggymaster] -setenv= - {[testenv]setenv} - _PYTEST_SETUP_SKIP_PLUGGY_DEP=1 -deps = - {[testenv]deps} - git+https://github.com/pytest-dev/pluggy.git@master - -[testenv:py37-pluggymaster] -setenv = {[testenv:py27-pluggymaster]setenv} -deps = {[testenv:py27-pluggymaster]deps} - [testenv:docs] basepython = python3 skipsdist = True