Merge remote-tracking branch 'origin/2.2' into 2.2

# Conflicts: # requirements.txt
2024-11-24 17:28:08 +00:00 · 2017-11-27 14:21:02 +07:00 · 2017-11-27 14:21:02 +07:00 · 09b1cac676
commit 09b1cac676
parent 1699ce5d1c e754db950d
2 changed files with 3 additions and 4 deletions
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@ -1,7 +1,7 @@
 -rrequirements.txt

 sphinx==1.6.2
-pytest==3.1.1
+pytest==3.2.5
 pep8==1.7.0
 pytest-catchlog==1.2.2
 pytest-timeout==1.2.0
--- a/requirements.txt
+++ b/requirements.txt
@ -6,6 +6,5 @@ Jinja2>=2.7.3
 raven>=5.23.0
 psutil>=3.0.0
 zipstream>=1.1.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
+typing>=3.5.3.0 # Otherwise yarl fail with python 3.4
+prompt-toolkit>=1.0.15