Skip to content

Commit 9333075

Browse files
authored
Merge pull request #239 from Cito/fix-pytest-version
Restrict the pytest version, because * the middleware test needs pytest >= 3.3 * other tests don't run with pytest >= 4.0
2 parents 8f7c8f3 + b740f82 commit 9333075

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
install_requires = ["six>=1.10.0", "promise>=2.1", "rx>=1.6.0"]
2525

2626
tests_requires = [
27-
"pytest==3.0.2",
27+
"pytest>=3.3,<4.0",
2828
"pytest-django==2.9.1",
2929
"pytest-cov==2.3.1",
3030
"coveralls",
31-
"gevent>=1.1rc1",
31+
"gevent>=1.1",
3232
"six>=1.10.0",
3333
"pytest-benchmark==3.0.0",
3434
"pytest-mock==1.2",
@@ -81,5 +81,5 @@ def run_tests(self):
8181
install_requires=install_requires,
8282
tests_require=tests_requires,
8383
cmdclass={"test": PyTest},
84-
extras_require={"gevent": ["gevent>=1.1rc1"], "test": tests_requires},
84+
extras_require={"gevent": ["gevent>=1.1"], "test": tests_requires},
8585
)

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ envlist = py27,py34,py35,py36,py37,pre-commit,pypy,mypy,docs
33

44
[testenv]
55
deps =
6-
pytest>=2.7.2
7-
gevent>=1.1rc1
6+
pytest>=3.3,<4.0
7+
gevent>=1.1
88
promise>=2.0
99
six>=1.10.0
1010
pytest-mock

0 commit comments

Comments
 (0)