From 1caffad371f2911793b6812a6a1a1dd9d7cf4e76 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 7 May 2021 11:19:04 +0100
Subject: [PATCH 1/2] Unpin attrs dep after new version has been released

c.f. #9936
---
 synapse/python_dependencies.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 7709361f1676..45a6b82834a1 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -79,7 +79,7 @@
     # Fedora 31 only has 19.1, so if we want to upgrade we should wait until 33
     # is out in November.)
     # Note: 21.1.0 broke `/sync`, see #9936
-    "attrs>=19.1.0,<21.1.0",
+    "attrs>=19.1.0,!=21.1.0",
     "netaddr>=0.7.18",
     "Jinja2>=2.9",
     "bleach>=1.4.3",

From fa6e16529f02762c96b218b97048e72fe17faaca Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 7 May 2021 11:20:09 +0100
Subject: [PATCH 2/2] Newsfile

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

diff --git a/changelog.d/9946.misc b/changelog.d/9946.misc
new file mode 100644
index 000000000000..142ec5496f76
--- /dev/null
+++ b/changelog.d/9946.misc
@@ -0,0 +1 @@
+Unpin attrs dependency.