Merge remote-tracking branch 'origin/release-v1.33.2' into develop

2021-05-07 13:27:19 +01:00 · 2021-05-07 13:27:19 +01:00 · b65ecaff9b
parent 25f43faa70 4df26abf28
commit b65ecaff9b
2 changed files with 2 additions and 1 deletions
--- a/changelog.d/9946.misc
+++ b/changelog.d/9946.misc
@ -0,0 +1 @@
+Unpin attrs dependency.
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@ -79,7 +79,7 @@ REQUIREMENTS = [
    # 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",