From fab948120f88e86df73d6bdd46b22bc5bc8583f9 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 16 Jan 2019 09:41:29 +0100 Subject: [PATCH 1/3] Use msgpack instead of msgpack-python The package msgpack-python has been deprecated. Signed-off-by: Andrej Shadura --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 69c5f9fe2..c7dd4917d 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -53,7 +53,7 @@ REQUIREMENTS = [ "sortedcontainers>=1.4.4", "psutil>=2.0.0", "pymacaroons-pynacl>=0.9.3", - "msgpack-python>=0.4.2", + "msgpack>=0.5.0", "phonenumbers>=8.2.0", "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics From 64cf6788d91dbd2a1a3b3613881e9c5609dc10af Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 16 Jan 2019 09:44:22 +0100 Subject: [PATCH 2/3] Depend on pymacaroons >= 0.13.0 instead on pymacaroons-pynacl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since 0.13.0, pymacaroons works correctly with pynacl, so there isn’t any more reason to depend on an outdated pynacl fork. Signed-off-by: Andrej Shadura --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index c7dd4917d..2fe790f95 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -52,7 +52,7 @@ REQUIREMENTS = [ "pillow>=3.1.2", "sortedcontainers>=1.4.4", "psutil>=2.0.0", - "pymacaroons-pynacl>=0.9.3", + "pymacaroons>=0.13.0", "msgpack>=0.5.0", "phonenumbers>=8.2.0", "six>=1.10", From 3b31a54a6e729f88884c3088eb989710910d8015 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 16 Jan 2019 09:51:13 +0100 Subject: [PATCH 3/3] Add a changelog entry Signed-off-by: Andrej Shadura --- changelog.d/4399.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4399.misc diff --git a/changelog.d/4399.misc b/changelog.d/4399.misc new file mode 100644 index 000000000..2f77a8fa5 --- /dev/null +++ b/changelog.d/4399.misc @@ -0,0 +1 @@ +Update dependencies on msgpack and pymacaroons to use the up-to-date packages.