From 6e10f31e431229e9abdf288177994388e468a415 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 22 May 2019 15:40:59 +0200 Subject: [PATCH 1/2] remove urllib3 pin requests 2.22.0 as been released supporting urllib3 1.25.2 Signed-off-by: Marcus Hoffmann --- synapse/python_dependencies.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index e3f828c4bb4b..f64baa4d5896 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -74,14 +74,6 @@ "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 = { From 269dc2a2e6442b8f92c222c057ba97bb859e8865 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 22 May 2019 15:52:16 +0200 Subject: [PATCH 2/2] add changelog entry Signed-off-by: Marcus Hoffmann --- changelog.d/5230.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/5230.misc diff --git a/changelog.d/5230.misc b/changelog.d/5230.misc new file mode 100644 index 000000000000..c681bc9748c4 --- /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.