summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Petrov <shazow@gmail.com>2015-04-23 14:51:12 -0400
committerAndrey Petrov <shazow@gmail.com>2015-04-23 14:51:12 -0400
commit32345be198ffef1611b591982c0ec89f9d194902 (patch)
tree0d5e6f38d6eee9630f60204051050df8e1f28750
parent95cf4524c9e02e505e11797380f697396ca5191f (diff)
parent69d6d377f23bf2644c40f6628f26c80b33e8bcd1 (diff)
downloadurllib3-32345be198ffef1611b591982c0ec89f9d194902.tar.gz
Merge pull request #596 from shazow/tornado-4
dev-requiments: tornado==4.1
-rw-r--r--dev-requirements.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 2eb58751..9ea36913 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -4,6 +4,4 @@ coverage==3.7.1
tox==1.7.1
twine==1.3.1
wheel==0.24.0
-
-# Tornado 3.2.2 makes our tests flaky, so we stick with 3.1
-tornado==3.1.1
+tornado==4.1