diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-05-03 19:25:01 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-05-03 19:25:01 +0100 |
| commit | 836d3adcce81bdafd8d9033df028485dcbb9d4ed (patch) | |
| tree | 1f8485651a7d7dc88908ae8783125c1b4afbf17d /synapse/python_dependencies.py | |
| parent | Add admin api for sending server_notices (#5121) (diff) | |
| parent | Merge tag 'v0.99.3.2' (diff) | |
| download | synapse-836d3adcce81bdafd8d9033df028485dcbb9d4ed.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 779f36dbed..2708f5e820 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 = { |