summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-19 18:27:56 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-19 18:27:56 +0100
commit29506f5c50f8d0661e776700f7308805493119ec (patch)
tree4ae591e36515c23904d3569dd15b909739f46fbe /synapse/python_dependencies.py
parentMerge commit 'ea4e4d2f0' into anoa/dinsic_release_1_21_x (diff)
parentUse the default templates when a custom template file cannot be found (#8037) (diff)
downloadsynapse-29506f5c50f8d0661e776700f7308805493119ec.tar.xz
Merge commit 'e04e465b4' into anoa/dinsic_release_1_21_x
* commit 'e04e465b4':
  Use the default templates when a custom template file cannot be found (#8037)
  Changelog changes
  Convert stream database to async/await. (#8074)
  Add a shadow-banned flag to users. (#8092)
  Convert pusher databases to async/await. (#8075)
  Convert receipts and events databases to async/await. (#8076)
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index e5f22fb858..3250d41dde 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -78,8 +78,6 @@ CONDITIONAL_REQUIREMENTS = { "matrix-synapse-ldap3": ["matrix-synapse-ldap3>=0.1"], # we use execute_batch, which arrived in psycopg 2.7. "postgres": ["psycopg2>=2.7"], - # 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": [