summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-23 17:27:49 +0000
committerErik Johnston <erik@matrix.org>2019-01-23 17:27:49 +0000
commit2a8edbaf74eec2e73634c40ecd9f1faa79b472c2 (patch)
tree00211aef7f4d7f5799b2104ed9d30ba05df635bf /synapse/python_dependencies.py
parentMerge branch 'erikj/msc_1813' into erikj/require_format_version (diff)
parentNewsfile (diff)
downloadsynapse-2a8edbaf74eec2e73634c40ecd9f1faa79b472c2.tar.xz
Merge branch 'erikj/get_pdu_versions' into erikj/require_format_version
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index 882e844eb1..756721e304 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -79,6 +79,10 @@ CONDITIONAL_REQUIREMENTS = { # ConsentResource uses select_autoescape, which arrived in jinja 2.9 "resources.consent": ["Jinja2>=2.9"], + # ACME support is required to provision TLS certificates from authorities + # that use the protocol, such as Let's Encrypt. + "acme": ["txacme>=0.9.2"], + "saml2": ["pysaml2>=4.5.0"], "url_preview": ["lxml>=3.5.0"], "test": ["mock>=2.0"],