diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2022-03-24 18:59:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-24 18:59:31 +0000 |
| commit | 84eb14c4d21315798048aed123c8222cfa96c566 (patch) | |
| tree | b52da80c7367138c8b7d9c0626793c51d5f3ca29 | |
| parent | Revert "Replace instances of deprecated `Jinja2.Markup` with `markupsafe.Mark... (diff) | |
| download | synapse-84eb14c4d21315798048aed123c8222cfa96c566.tar.xz | |
Pin Jinja to <3.1.0 (#12297)
as 3.1.0 removed the deprecated jinja2.Markup class which we still rely on.
| -rw-r--r-- | changelog.d/12297.misc | 1 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/changelog.d/12297.misc b/changelog.d/12297.misc new file mode 100644 index 0000000000..7bf05305f6 --- /dev/null +++ b/changelog.d/12297.misc @@ -0,0 +1 @@ +Pin Jinja to <3.1.0, as Synapse fails to start with Jinja 3.1.0. \ No newline at end of file diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 1dd39f06cf..79ae06ce5d 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -74,7 +74,8 @@ REQUIREMENTS = [ # Note: 21.1.0 broke `/sync`, see #9936 "attrs>=19.2.0,!=21.1.0", "netaddr>=0.7.18", - "Jinja2>=2.9", + # Jinja2 3.1.0 removes the deprecated jinja2.Markup class, which we rely on. + "Jinja2<3.1.0", "bleach>=1.4.3", # We use `ParamSpec`, which was added in `typing-extensions` 3.10.0.0. "typing-extensions>=3.10.0", |