tox: cleanup/revisit deps

This commit is contained in:
Daniel Hahler 2019-02-10 14:02:56 +01:00
parent 82b8ec37fc
commit 5e2d740829
1 changed files with 9 additions and 8 deletions

17
tox.ini
View File

@ -25,7 +25,8 @@ commands =
coverage: coverage report coverage: coverage report
passenv = USER USERNAME COVERAGE_* TRAVIS passenv = USER USERNAME COVERAGE_* TRAVIS
setenv = setenv =
# configuration if a user runs tox with a "coverage" factor, for example "tox -e py37-coverage" # Configuration to run with coverage similar to Travis/Appveyor, e.g.
# "tox -e py37-coverage".
coverage: _PYTEST_TOX_COVERAGE_RUN=coverage run -m coverage: _PYTEST_TOX_COVERAGE_RUN=coverage run -m
coverage: _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess coverage: _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess
coverage: COVERAGE_FILE={toxinidir}/.coverage coverage: COVERAGE_FILE={toxinidir}/.coverage
@ -52,8 +53,8 @@ commands = pre-commit run --all-files --show-diff-on-failure
[testenv:py27-xdist] [testenv:py27-xdist]
extras = testing extras = testing
deps = deps =
{[testenv]deps}
pytest-xdist>=1.13 pytest-xdist>=1.13
{env:_PYTEST_TOX_EXTRA_DEP:}
commands = commands =
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n auto {posargs} {env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n auto {posargs}
@ -61,15 +62,15 @@ commands =
# NOTE: copied from above due to https://github.com/tox-dev/tox/issues/706. # NOTE: copied from above due to https://github.com/tox-dev/tox/issues/706.
extras = testing extras = testing
deps = deps =
{[testenv]deps}
pytest-xdist>=1.13 pytest-xdist>=1.13
{env:_PYTEST_TOX_EXTRA_DEP:}
commands = {[testenv:py27-xdist]commands} commands = {[testenv:py27-xdist]commands}
[testenv:py27-pexpect] [testenv:py27-pexpect]
platform = linux|darwin platform = linux|darwin
deps = deps =
{[testenv]deps}
pexpect pexpect
{env:_PYTEST_TOX_EXTRA_DEP:}
commands = commands =
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py} {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py}
@ -81,8 +82,8 @@ commands = {[testenv:py27-pexpect]commands}
[testenv:py27-nobyte] [testenv:py27-nobyte]
extras = testing extras = testing
deps = deps =
{[testenv]deps}
pytest-xdist>=1.13 pytest-xdist>=1.13
{env:_PYTEST_TOX_EXTRA_DEP:}
distribute = true distribute = true
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}
@ -92,8 +93,8 @@ commands =
[testenv:py27-trial] [testenv:py27-trial]
deps = deps =
{[testenv]deps}
twisted twisted
{env:_PYTEST_TOX_EXTRA_DEP:}
commands = commands =
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/test_unittest.py} {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/test_unittest.py}
@ -103,8 +104,8 @@ commands = {[testenv:py27-trial]commands}
[testenv:py27-numpy] [testenv:py27-numpy]
deps = deps =
{[testenv]deps}
numpy numpy
{env:_PYTEST_TOX_EXTRA_DEP:}
commands= commands=
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/python/approx.py} {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/python/approx.py}
@ -138,8 +139,8 @@ commands =
basepython = python3 basepython = python3
skipsdist = True skipsdist = True
deps = deps =
{[testenv]deps}
PyYAML PyYAML
{env:_PYTEST_TOX_EXTRA_DEP:}
commands = commands =
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest doc/en {env:_PYTEST_TOX_COVERAGE_RUN:} pytest doc/en
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest --doctest-modules --pyargs _pytest {env:_PYTEST_TOX_COVERAGE_RUN:} pytest --doctest-modules --pyargs _pytest