summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-08-29 11:18:57 +0100
committerErik Johnston <erik@matrix.org>2019-08-29 11:18:57 +0100
commita81e0233e917178750c45c067476332407f5658c (patch)
treee5d2f134baa7f420fde71afc484d2c62b71df33c /synapse/python_dependencies.py
parentMerge branch 'release-v1.3.1' into matrix-org-hotfixes (diff)
parentAdd a link to python's logging config schema (#5926) (diff)
downloadsynapse-a81e0233e917178750c45c067476332407f5658c.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.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index c6465c0386..ec0ac547c1 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -47,9 +47,9 @@ REQUIREMENTS = [ "idna>=2.5", # 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. - "Twisted>=18.7.0", + # Twisted 18.9 introduces some logger improvements that the structured + # logger utilises + "Twisted>=18.9.0", "treq>=15.1", # Twisted has required pyopenssl 16.0 since about Twisted 16.6. "pyopenssl>=16.0.0",