Fixup floating `pytest-timeout` dep.
Review Request #3126 - Created Nov. 15, 2015 and submitted
|benjyw, stuhood, zundel|
A `1.0.0` release of `pytest-timeout` bumped its pytest dep to `>=2.8.0` which conflicts with our injected `pytest` requirement. As a bandaid, bound `pytest-timeout` to prevent conflict. src/python/pants/backend/python/tasks/pytest_run.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Locally reproed with:
` $ ./pants clean-all test tests/python/pants_test/base:: ... Exception message: Could not satisfy all requirements for pytest>=2.6,<2.7: pytest>=2.6,<2.7, pytest>=2.6.0(from: pytest-cov>=1.8,<1.9), pytest>=2.8.0(from: pytest-timeout)
After fix the same command line successfully resolves a test chroot and
CI went green here:
NB: I'll explain the workaround for those who cannot upgrade in the release notes and release email, namely adding a - probably fake - dep on pytest-timeout to pin it low.
This works for example for aurora; though, in their case, it would need to be applied to 87 targets, none of which actually use pytest-timeout:$ git diff -U1 diff --git a/3rdparty/python/requirements.txt b/3rdparty/python/requirements.txt index 3a78b75..994122f 100644 --- a/3rdparty/python/requirements.txt +++ b/3rdparty/python/requirements.txt @@ -11,2 +11,3 @@ psutil==3.2.2 pystachio==0.8.0 +pytest-timeout==0.5.0 requests==2.7.0 diff --git a/src/test/python/apache/thermos/core/BUILD b/src/test/python/apache/thermos/core/BUILD index 53cc575..674b32e 100644 --- a/src/test/python/apache/thermos/core/BUILD +++ b/src/test/python/apache/thermos/core/BUILD @@ -56,2 +56,3 @@ python_tests(name = 'test_angry', dependencies = [ + '3rdparty/python:pytest-timeout', 'src/main/python/apache/thermos/testing',