Skip to content

Commit 8c4dfca

Browse files
authored
Merge pull request #6535 from blueyed/tox-doctesting
tox: move doctesting into main testenv
2 parents 0f78ef8 + ef294fc commit 8c4dfca

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

tox.ini

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ envlist =
2020
[testenv]
2121
commands =
2222
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:{env:_PYTEST_TOX_DEFAULT_POSARGS:}}
23+
doctesting: {env:_PYTEST_TOX_COVERAGE_RUN:} pytest --doctest-modules --pyargs _pytest
2324
coverage: coverage combine
2425
coverage: coverage report -m
2526
passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS TERM
2627
setenv =
27-
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_XDIST:}
28+
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_DOCTESTING:} {env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_XDIST:}
2829

2930
# Configuration to run with coverage similar to CI, e.g.
3031
# "tox -e py37-coverage".
@@ -33,13 +34,16 @@ setenv =
3334
coverage: COVERAGE_FILE={toxinidir}/.coverage
3435
coverage: COVERAGE_PROCESS_START={toxinidir}/.coveragerc
3536

37+
doctesting: _PYTEST_TOX_POSARGS_DOCTESTING=doc/en
38+
3639
nobyte: PYTHONDONTWRITEBYTECODE=1
3740

3841
lsof: _PYTEST_TOX_POSARGS_LSOF=--lsof
3942

4043
xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto
4144
extras = testing
4245
deps =
46+
doctesting: PyYAML
4347
oldattrs: attrs==17.4.0
4448
oldattrs: hypothesis<=4.38.1
4549
numpy: numpy
@@ -90,16 +94,6 @@ deps = -r{toxinidir}/doc/en/requirements.txt
9094
commands =
9195
sphinx-build -W -q --keep-going -b linkcheck . _build
9296

93-
[testenv:doctesting]
94-
basepython = python3
95-
skipsdist = True
96-
deps =
97-
{[testenv]deps}
98-
PyYAML
99-
commands =
100-
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest doc/en
101-
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest --doctest-modules --pyargs _pytest
102-
10397
[testenv:regen]
10498
changedir = doc/en
10599
skipsdist = True

0 commit comments

Comments
 (0)