diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-05-03 19:24:42 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-05-03 19:24:42 +0100 |
| commit | 9b86d3dee69702cd9fa02e7f454fd0e92a7761bb (patch) | |
| tree | 73bc79d1abde252d6433a6ccfd5ca7956589588e /synapse/python_dependencies.py | |
| parent | add gpg key fingerprint (diff) | |
| parent | 0.99.3.2 (diff) | |
| download | synapse-9b86d3dee69702cd9fa02e7f454fd0e92a7761bb.tar.xz | |
Merge tag 'v0.99.3.2'
Synapse 0.99.3.2 (2019-05-03) ============================= Internal Changes ---------------- - Ensure that we have `urllib3` <1.25, to resolve incompatibility with `requests`. ([\#5135](https://github.com/matrix-org/synapse/issues/5135))
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 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 = { |