summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-08-29 16:44:24 -0400
committerGitHub <noreply@github.com>2016-08-29 16:44:24 -0400
commit9c5881c375e5177819b3bfe3070b068a81e3d63c (patch)
tree137c47a25b29f6ee65137686760ece7611ed5dee /setup.py
parentf455ee4f5881fa549c2dc864efc9848e170de6ef (diff)
parentc7c6522000dc6a32f5933dc837b188b612744b3b (diff)
downloadpython-setuptools-git-9c5881c375e5177819b3bfe3070b068a81e3d63c.tar.gz
Merge pull request #765 from timheap/bad-pytest-version
Install py.test>=2.8,<3
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py2
1 files changed, 1 insertions, 1 deletions
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,