Skip to content

Commit

Permalink
tox: generic pluggymaster factor
Browse files Browse the repository at this point in the history
  • Loading branch information
blueyed committed Mar 3, 2019
1 parent ed68fcf commit 2970c1d
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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:.*}
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2970c1d

Please sign in to comment.