diff options
| author | Erik Johnston <erik@matrix.org> | 2018-09-19 15:08:36 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-09-19 15:08:36 +0100 |
| commit | ce846bb620e9866531f4a49f183fdd3cbb3f1eeb (patch) | |
| tree | ed38561118af50948598967e17ad6a7f1fee8a8c /synapse/python_dependencies.py | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #3910 from matrix-org/erikj/update_timeout (diff) | |
| download | synapse-ce846bb620e9866531f4a49f183fdd3cbb3f1eeb.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 942d7c721f..0d8de600cf 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -40,9 +40,10 @@ REQUIREMENTS = { "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "Twisted>=17.1.0": ["twisted>=17.1.0"], + "treq>=15.1": ["treq>=15.1"], - # We use crypto.get_elliptic_curve which is only supported in >=0.15 - "pyopenssl>=0.15": ["OpenSSL>=0.15"], + # Twisted has required pyopenssl 16.0 since about Twisted 16.6. + "pyopenssl>=16.0.0": ["OpenSSL>=16.0.0"], "pyyaml": ["yaml"], "pyasn1": ["pyasn1"], |