From f522cde541b8d8b7f5001c952119950da38ccc5e Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Wed, 5 Jun 2019 17:11:04 +0100
Subject: [PATCH] Change jinja2 and bleach back to opt deps

---
 synapse/python_dependencies.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 3ad421ac2f..20b0167869 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -74,13 +74,12 @@ REQUIREMENTS = [
     "attrs>=17.4.0",
 
     "netaddr>=0.7.18",
-    "Jinja2>=2.9",
-    "bleach>=1.4.2",
-    "html5lib>=1.0.1",
 ]
 
 CONDITIONAL_REQUIREMENTS = {
     "matrix-synapse-ldap3": ["matrix-synapse-ldap3>=0.1"],
+    "email.enable_notifs": ["Jinja2>=2.9", "bleach>=1.4.2"],
+    "enable_password_resets": ["Jinja2>=2.9", "bleach>=1.4.2"],
 
     # we use execute_batch, which arrived in psycopg 2.7.
     "postgres": ["psycopg2>=2.7"],