From 4c8f84f97de105952e194c9a45e8cd926f3b1634 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 18 Mar 2016 22:41:42 +0100
Subject: [PATCH] tox: Update to pytest 2.9.1

- Improve error message when a plugin fails to load.
- pytest.fail with non-ascii characters raises an internal pytest error.
- junit parses report.nodeid incorrectly, when params IDs contain ::.
- SyntaxErrors containing non-ascii lines at the point of failure generated an
  internal py.test error.
- When passing in a bytestring regex pattern to parameterize attempt to decode
  it as utf-8 ignoring errors.
- parametrized test nodes cannot be specified to run on the command line.
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 66875ebb2..980acfe46 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.9.0
+    pytest==2.9.1
     pytest-bdd==2.16.0
     pytest-catchlog==1.2.2
     pytest-cov==2.2.1