Update pytest and pytest-xdist

Part of #1023
2 files changed