Skip to content

Commit

Permalink
Remove xdist (#2043)
Browse files Browse the repository at this point in the history
Signed-off-by: Bernát Gábor <[email protected]>
  • Loading branch information
gaborbernat authored Dec 22, 2020
1 parent bc787b2 commit 36fba76
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ testing =
pytest-mock>=2
pytest-randomly>=1
pytest-timeout>=1
pytest-xdist>=1.31.0
packaging>=20.0;python_version>"3.4"
xonsh>=0.9.16;python_version > '3.4' and python_version != '3.9'

Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,13 @@ setenv =
PYTHONIOENCODING = utf-8
_COVERAGE_SRC = {envsitepackagesdir}/virtualenv
{py34,py27,pypy2, upgrade}: PYTHONWARNINGS = ignore:DEPRECATION::pip._internal.cli.base_command
{py34,pypy2,py27}: PYTEST_XDIST = 0
extras =
testing
commands =
python -m coverage erase
python -m coverage run -m pytest \
--junitxml {toxworkdir}/junit.{envname}.xml \
{posargs:tests --int --timeout 600 -n {env:PYTEST_XDIST:auto}}
{posargs:tests --int --timeout 600}
python -m coverage combine
python -m coverage report --skip-covered --show-missing
python -m coverage xml -o {toxworkdir}/coverage.{envname}.xml
Expand Down

0 comments on commit 36fba76

Please sign in to comment.