summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-17 14:10:28 +0100
committerErik Johnston <erik@matrix.org>2019-06-17 14:10:28 +0100
commitc08e4dbadc36d5547d4ff14ec4d985823666fb80 (patch)
tree3a79f31f2785db645e5f28088c63e8e06c01c0ca /synapse/python_dependencies.py
parentMerge branch 'master' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #5385 from matrix-org/erikj/reduce_http_exceptions (diff)
downloadsynapse-c08e4dbadc36d5547d4ff14ec4d985823666fb80.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index 7dfa78dadb..11ace2bfb1 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -44,7 +44,7 @@ REQUIREMENTS = [ "canonicaljson>=1.1.3", "signedjson>=1.0.0", "pynacl>=1.2.1", - "idna>=2", + "idna>=2.5", # validating SSL certs for IP addresses requires service_identity 18.1. "service_identity>=18.1.0", @@ -65,7 +65,7 @@ REQUIREMENTS = [ "sortedcontainers>=1.4.4", "psutil>=2.0.0", "pymacaroons>=0.13.0", - "msgpack>=0.5.0", + "msgpack>=0.5.2", "phonenumbers>=8.2.0", "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics