Merge pull request #765 from timheap/bad-pytest-version

Install py.test>=2.8,<3

3 files changed, 6 insertions, 3 deletions

diff --git a/.travis.yml b/.travis.yml
index ed077d94..81d1f170 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 c37c9980..3b7ab31b 100755
--- a/setup.py
+++ b/setup.py
@@ -181,7 +181,7 @@ setup_params = dict(
     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 7ce7ce41..868ba317 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'