Skip to content

Commit 48dbb59

Browse files
committed
Enforce tornado 4.x until the Tornado 5.0 support is fixed
Tornado 5.x starts it's own event loop, breaking other packages: jupyter/notebook#3397 http://www.tornadoweb.org/en/stable/releases/v5.0.0.html#backwards-compatibility-notes
1 parent 50703bd commit 48dbb59

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: install clean test retest coverage docs
22

33
install:
4-
pip install -e .[docs,test,async]
4+
pip install -e .[docs,test,async,tornado]
55
pip install bumpversion twine wheel
66

77
lint:

Diff for: setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
]
2121

2222
tornado_require = [
23-
'tornado>=4.0.2'
23+
'tornado>=4.0.2,<5'
2424
]
2525

2626
async_require = [] # see below
@@ -49,7 +49,7 @@
4949

5050
if sys.version_info > (3, 4, 2):
5151
async_require.append('aiohttp>=1.0')
52-
tests_require.append('aioresponses>=0.1.3')
52+
tests_require.append('aioresponses>=0.4.1')
5353

5454

5555
with open('README.rst') as fh:

Diff for: tox.ini

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ envlist = py27,py33,py34,py35,py36,pypy
44

55
[testenv]
66
extras =
7-
test
7+
test
88
xmlsec
99
py{35,36}: async
10+
py{35,36}: tornado
1011
deps =
11-
py{35,36}: aioresponses==0.1.3
12+
py{35,36}: aioresponses==0.4.1
1213
py{35,36}: pytest-asyncio==0.5.0
1314
commands = coverage run --parallel -m pytest {posargs}
1415

0 commit comments

Comments
 (0)