pytest-warnings is not needed since it was integrated into pytest's
core since 3.1
pytest-timeout >= 1.3.0 requires pytest >= 3.6.0 and we want to keep
using 3.2.5
Cc: Juan A. Suarez Romero <jasua...@igalia.com>
Cc: Dylan Baker <dylan.c.ba...@intel.com>
Signed-off-by: Andres Gomez <ago...@igalia.com>
---
tox.ini | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tox.ini b/tox.ini
index 12e8abd9f..179405356 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,8 +24,7 @@ deps =
pytest-mock
pytest-pythonpath
pytest-raises
- pytest-warnings
- pytest-timeout
+ pytest-timeout==1.2.1
py{27,33,34}: mako==0.8.0
six==1.5.2
{accel,noaccel,streams}: jsonschema
--
2.18.0
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
