Merge remote-tracking branch 'origin/unlock-yarl' into 2.1

This commit is contained in:
grossmj 2018-01-18 12:10:19 +08:00
commit cf4477ce34

View File

@ -1,11 +1,10 @@
jsonschema>=2.4.0 jsonschema>=2.4.0
aiohttp>=2.2.0,<2.4.0 # pyup: ignore aiohttp>=2.2.0,<2.4.0 # pyup: ignore
aiohttp-cors>=0.5.3,<0.6.0 # pyup: ignore aiohttp-cors>=0.5.3,<0.6.0 # pyup: ignore
yarl>=0.11,<0.12 # pyup: ignore yarl>=0.11
Jinja2>=2.7.3 Jinja2>=2.7.3
raven>=5.23.0 raven>=5.23.0
psutil>=3.0.0 psutil>=3.0.0
zipstream>=1.1.4 zipstream>=1.1.4
typing>=3.5.3.0 # Otherwise yarl fails with python 3.4 typing>=3.5.3.0 # Otherwise yarl fails with python 3.4
multidict<3.2.0 # Otherwise fails when upgraded to v3.2.0
prompt-toolkit prompt-toolkit