Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Only import jinja2 when needed #5514

Merged
merged 7 commits into from
Jun 21, 2019
Merged

Only import jinja2 when needed #5514

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5707426
Only import jinja2 when needed
anoadragon453 Jun 21, 2019
c0a72cc
Add changelog
anoadragon453 Jun 21, 2019
96d1def
import sys
anoadragon453 Jun 21, 2019
0f905a1
Fix changelog number and content
anoadragon453 Jun 21, 2019
521d43c
Make jinja2 and bleach required deps
anoadragon453 Jun 21, 2019
e8eec16
lint
anoadragon453 Jun 21, 2019
aba6a6b
Update changelog entry to be more user-friendly
anoadragon453 Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5514.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make jinja2 and bleach required dependencies.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remember that the changelog is for the users' benefit, not ours. Please can you document change that the user will see, rather than the means by which we are achieving the change?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very good point - thanks for the reminder.

3 changes: 2 additions & 1 deletion synapse/python_dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down