From ff76c8626183f8b0240ecc8b73188e8692210d3b Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Fri, 18 Feb 2022 11:00:58 +0000
Subject: [PATCH 1/3] Update the olddeps CI check to use an old version of
 markupsafe

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 2b3d39e0340f..c0dc26c168a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -124,6 +124,7 @@ usedevelop = false
 deps =
     Automat == 0.8.0
     lxml
+    markupsafe < 2.1
     {[base]deps}
 
 commands =

From 94f4fb208fbb9563db73ae1aa1aeea3e0418299e Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Fri, 18 Feb 2022 11:03:53 +0000
Subject: [PATCH 2/3] Changelog

---
 changelog.d/12025.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/12025.misc

diff --git a/changelog.d/12025.misc b/changelog.d/12025.misc
new file mode 100644
index 000000000000..d9475a771881
--- /dev/null
+++ b/changelog.d/12025.misc
@@ -0,0 +1 @@
+Update the `olddeps` CI job to use an old version of `markupsafe`.

From ae83928599c34ae00b1841d79ecba7bdf8467f14 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Fri, 18 Feb 2022 11:08:56 +0000
Subject: [PATCH 3/3] Comment

---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tox.ini b/tox.ini
index c0dc26c168a6..41678aa38bee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -124,6 +124,8 @@ usedevelop = false
 deps =
     Automat == 0.8.0
     lxml
+    # markupsafe 2.1 introduced a change that breaks Jinja 2.x. Since we depend on
+    # Jinja >= 2.9, it means this test suite will fail if markupsafe >= 2.1 is installed.
     markupsafe < 2.1
     {[base]deps}