Merge pull request #3249 from xavfernandez/pin_pytest_timeout

Pin pytest-timeout==0.5
pypa · Nov 16, 2015 · e609509 · e609509
2 parents 78e7d62 + 1275a0f
commit e609509
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -3,7 +3,8 @@ pretend
 # Pinned to 2.7.2 to avoid an issue with parallel builds
 pytest==2.7.2
 pytest-capturelog
-pytest-timeout
+# Pinned to 0.5 to stay compatible with pytest==2.7.2
+pytest-timeout==0.5
 pytest-xdist
 mock<1.1
 scripttest>=1.3