diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-10 18:33:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-06-10 18:33:55 +0100 |
| commit | abce00fc6a722884d68aa56081b0e86a3c667b00 (patch) | |
| tree | 8a116e98cc94acb1e0393f0ecd8d63ca2c6893f7 /synapse/python_dependencies.py | |
| parent | Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_ms (diff) | |
| parent | 1.0.0rc2 (diff) | |
| download | synapse-abce00fc6a722884d68aa56081b0e86a3c667b00.tar.xz | |
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index c78f2cb15e..6efd81f204 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -44,7 +44,10 @@ REQUIREMENTS = [ "canonicaljson>=1.1.3", "signedjson>=1.0.0", "pynacl>=1.2.1", - "service_identity>=16.0.0", + "idna>=2", + + # validating SSL certs for IP addresses requires service_identity 18.1. + "service_identity>=18.1.0", # our logcontext handling relies on the ability to cancel inlineCallbacks # (https://twistedmatrix.com/trac/ticket/4632) which landed in Twisted 18.7. |