summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-29 15:01:52 +0100
committerOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-29 15:01:52 +0100
commit7c0224d5c051bf6fb34cb372bb6aae928de4bc78 (patch)
tree57b7119644911027d4a73047412068bb002d7cb0 /synapse/python_dependencies.py
parentCode formatting (Black) (diff)
parentMerge branch 'develop' into rei/rss_target (diff)
downloadsynapse-7c0224d5c051bf6fb34cb372bb6aae928de4bc78.tar.xz
Merge branch 'rei/rss_target' into rei/rss_inc6
Diffstat (limited to '')
-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",