From 879f99bddf7eea8e92d6af1ce6494e30016650d9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 13 Dec 2015 13:17:53 +0100
Subject: [PATCH] tox: Update pytest to 2.8.5.

- fixed issue where class attributes injected during collection could break pytest.
- precompute junitxml chunks instead of storing the whole tree in objects
- fix ``pytest.deprecated_call()`` receiving multiple arguments
  (Regression introduced in 2.8.4).
---
 tox.ini | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index 6c59e2988..96f4bccbd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ deps =
     parse==1.6.6
     parse-type==0.3.4
     py==1.4.31
-    pytest==2.8.4
+    pytest==2.8.5
     pytest-bdd==2.15.0
     pytest-catchlog==1.2.1
     pytest-cov==2.2.0
@@ -155,7 +155,7 @@ deps =
     execnet==1.4.1
     py==1.4.31
     pyflakes==1.0.0
-    pytest==2.8.4
+    pytest==2.8.5
     pytest-cache==1.0
     pytest-flakes==1.0.1
 commands =
@@ -170,7 +170,7 @@ deps =
     execnet==1.4.1
     pep8==1.6.2
     py==1.4.31
-    pytest==2.8.4
+    pytest==2.8.5
     pytest-cache==1.0
     pytest-pep8==1.0.6
 commands =
@@ -186,7 +186,7 @@ deps =
     execnet==1.4.1
     mccabe==0.3.1
     py==1.4.31
-    pytest==2.8.4
+    pytest==2.8.5
     pytest-cache==1.0
     pytest-mccabe==0.1
 commands =