tox: remove pytest-warnings and set pytest-timeout to 1.2.1

Submitted by Andres Gomez on July 19, 2018, 4:08 p.m.

Details

Message ID 20180719160812.30461-1-agomez@igalia.com
State Accepted
Headers show
Series "tox: remove pytest-warnings and set pytest-timeout to 1.2.1" ( rev: 1 ) in Piglit

Not browsing as part of any series.

Commit Message

Andres Gomez July 19, 2018, 4:08 p.m.
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 <jasuarez@igalia.com>
Cc: Dylan Baker <dylan.c.baker@intel.com>
Signed-off-by: Andres Gomez <agomez@igalia.com>
---
 tox.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch hide | download patch | download mbox

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

Comments

Reviewed-by: Dylan Baker <dylan@pnwbakers.com>

Quoting Andres Gomez (2018-07-19 09:08:12)
> 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 <jasuarez@igalia.com>
> Cc: Dylan Baker <dylan.c.baker@intel.com>
> Signed-off-by: Andres Gomez <agomez@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