summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorMarcus Hoffmann <bubu@bubu1.eu>2019-05-22 17:48:12 +0200
committerAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-05-22 16:48:12 +0100
commit62388a1e44278f9aa22244750433ac46142b266a (patch)
tree8a2c9ebf11cb3b54f4e528c3199d150bec05bb0d /synapse/python_dependencies.py
parentMerge branch 'master' into develop (diff)
downloadsynapse-62388a1e44278f9aa22244750433ac46142b266a.tar.xz
remove urllib3 pin (#5230)
requests 2.22.0 as been released supporting urllib3 1.25.2

Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index e3f828c4bb..f64baa4d58 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -74,14 +74,6 @@ REQUIREMENTS = [
     "attrs>=17.4.0",
 
     "netaddr>=0.7.18",
-
-    # requests is a transitive dep of treq, and urlib3 is a transitive dep
-    # of requests, as well as of sentry-sdk.
-    #
-    # As of requests 2.21, requests does not yet support urllib3 1.25.
-    # (If we do not pin it here, pip will give us the latest urllib3
-    # due to the dep via sentry-sdk.)
-    "urllib3<1.25",
 ]
 
 CONDITIONAL_REQUIREMENTS = {