diff options
| author | Marcus Hoffmann <bubu@bubu1.eu> | 2019-05-22 17:48:12 +0200 |
|---|---|---|
| committer | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-05-22 16:48:12 +0100 |
| commit | 62388a1e44278f9aa22244750433ac46142b266a (patch) | |
| tree | 8a2c9ebf11cb3b54f4e528c3199d150bec05bb0d | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-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>
| -rw-r--r-- | changelog.d/5230.misc | 1 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/changelog.d/5230.misc b/changelog.d/5230.misc new file mode 100644 index 0000000000..c681bc9748 --- /dev/null +++ b/changelog.d/5230.misc @@ -0,0 +1 @@ +Remove urllib3 pin as requests 2.22.0 has been released supporting urllib3 1.25.2. 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 = { |