Skip to content

Commit

Permalink
Merge pull request #201 from sbesson/pytest-xdist
Browse files Browse the repository at this point in the history
Cap pytest-xdist to avoid psutil failures
  • Loading branch information
manics committed Aug 19, 2020
2 parents 35bb57b + c377b69 commit ba64516
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ deps =
PyYAML
py27: tables < 3.6.0
py36: tables
pytest-xdist
# https://github.com/pytest-dev/pytest-xdist/issues/585
pytest-xdist < 2
restructuredtext-lint
py27: https://github.com/ome/zeroc-ice-py-manylinux/releases/download/0.1.0/zeroc_ice-3.6.5-cp27-cp27mu-manylinux2010_x86_64.whl
py36: https://github.com/ome/zeroc-ice-py-manylinux/releases/download/0.1.0/zeroc_ice-3.6.5-cp36-cp36m-manylinux2010_x86_64.whl
Expand Down

0 comments on commit ba64516

Please sign in to comment.