summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-03 18:30:13 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-03 18:33:10 +0100
commite3281d7d261ee533818ae1638014295bbb4b98af (patch)
tree711728eb015daa872ba5f363822746702c7b0781
parentchangelog tweaks (diff)
downloadsynapse-e3281d7d261ee533818ae1638014295bbb4b98af.tar.xz
pin urllib3 to <1.25
-rw-r--r--synapse/python_dependencies.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index f71e21ff4d..c75119a030 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -69,6 +69,14 @@ 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 = {