Only import jinja2 when needed (#5514)

matrix-org · Feb 13, 2020 · 7feac0e · 7feac0e
2 parents 071b7eb + 5d6644e
commit 7feac0e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/changelog.d/5514.bugfix b/changelog.d/5514.bugfix
@@ -0,0 +1 @@
+Fix bug with `jinja2` preventing Synapse from starting. Users who had this problem should now simply need to run `pip install matrix-synapse`.
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
@@ -72,10 +72,11 @@
     # Twisted 18.7.0 requires attrs>=17.4.0
     "attrs>=17.4.0",
     "netaddr>=0.7.18",
+    "Jinja2>=2.9",
+    "bleach>=1.4.3",
 ]
 
 CONDITIONAL_REQUIREMENTS = {
-    "email": ["Jinja2>=2.9", "bleach>=1.4.3"],
     "matrix-synapse-ldap3": ["matrix-synapse-ldap3>=0.1"],
     # we use execute_batch, which arrived in psycopg 2.7.
     "postgres": ["psycopg2>=2.7"],
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix bug with `jinja2` preventing Synapse from starting. Users who had this problem should now simply need to run `pip install matrix-synapse`.