summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2022-04-12 11:49:02 +0100
committerGitHub <noreply@github.com>2022-04-12 10:49:02 +0000
commit3ad74b63e5721d318981d22d3b5c948c72506342 (patch)
tree509704578ffd57cdd0c83a0aeee377dca0fea2d1 /synapse
parentWorkaround pip bug installing latest treq and not-latest twisted from hashes ... (diff)
downloadsynapse-3ad74b63e5721d318981d22d3b5c948c72506342.tar.xz
Specify tls extra for Twisted dependency. (#12444)
* Specify `tls` extra for Twisted dependency.

It was already pulled in for us by `treq`, but we should be explicit
that we do use the `tls` functionality of Twisted directly.

* Mark `idna` as dev-dependency

This doesn't actually change anything, as `Twisted[tls]` will put it in
as a main dependency anyway.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/python_dependencies.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 8bd91d5f72..ec199a161d 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -50,12 +50,11 @@ REQUIREMENTS = [
     # we use the type definitions added in signedjson 1.1.
     "signedjson>=1.1.0",
     "pynacl>=1.2.1",
-    "idna>=2.5",
     # validating SSL certs for IP addresses requires service_identity 18.1.
     "service_identity>=18.1.0",
     # Twisted 18.9 introduces some logger improvements that the structured
     # logger utilises
-    "Twisted>=18.9.0",
+    "Twisted[tls]>=18.9.0",
     "treq>=15.1",
     # Twisted has required pyopenssl 16.0 since about Twisted 16.6.
     "pyopenssl>=16.0.0",