From c7c6522000dc6a32f5933dc837b188b612744b3b Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Mon, 29 Aug 2016 16:20:54 +1000
Subject: [PATCH] Install py.test>=2.8,<3

The 3.x series is currently broken. Until py.test works again, 3.x
should not be used by anything.
---
 .travis.yml | 2 +-
 setup.py    | 2 +-
 tox.ini     | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ed077d9460..81d1f170f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ env:
  - LC_ALL=C LC_CTYPE=C
 script:
  # avoid VersionConflict when newer version is required
- - pip install -U pytest
+ - pip install -U 'pytest>=2.8,<3'
 
  # Output the env, because the travis docs just can't be trusted
  - env
diff --git a/setup.py b/setup.py
index c37c998022..3b7ab31bf8 100755
--- a/setup.py
+++ b/setup.py
@@ -181,7 +181,7 @@ def pypi_link(pkg_filename):
     tests_require=[
         'setuptools[ssl]',
         'pytest-flake8',
-        'pytest>=2.8,!=3.0.0',
+        'pytest>=2.8,<3',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
     ] + pytest_runner + wheel,
diff --git a/tox.ini b/tox.ini
index 7ce7ce4152..868ba317e7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,5 +2,8 @@
 envlist = py26,py27,py33,py34,py35,pypy,pypy3
 
 [testenv]
+deps=
+	pytest-flake8
+	pytest>=2.8,<3
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir
-commands=python setup.py test
+commands=python setup.py test --addopts='-rsx'