diff options
| author | Richard van der Hoff <richard@matrix.org> | 2022-03-24 19:39:45 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2022-03-24 19:39:45 +0000 |
| commit | b0659a112d585a5e81ea429f4fd8d9e67cdee78d (patch) | |
| tree | e43ac56c82bcffb18014dfe2c03aa6b55a14713b /synapse/python_dependencies.py | |
| parent | Remove unused test code. (#12291) (diff) | |
| parent | changelog (diff) | |
| download | synapse-b0659a112d585a5e81ea429f4fd8d9e67cdee78d.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 232f9a9595..79ae06ce5d 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -74,8 +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", - "MarkupSafe>=2.0", + # 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", |