diff options
| author | Erik Johnston <erik@matrix.org> | 2021-05-07 13:27:19 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-05-07 13:27:19 +0100 |
| commit | b65ecaff9b616ba730f3d701acb1571045a603e0 (patch) | |
| tree | 7e1aec471410116f471780b5cab3ae3632f4c76d | |
| parent | Reorganise the database schema directories (#9932) (diff) | |
| parent | Unpin attrs dep after new version has been released (#9946) (diff) | |
| download | synapse-b65ecaff9b616ba730f3d701acb1571045a603e0.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.33.2' into develop
| -rw-r--r-- | changelog.d/9946.misc | 1 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/9946.misc b/changelog.d/9946.misc new file mode 100644 index 0000000000..142ec5496f --- /dev/null +++ b/changelog.d/9946.misc @@ -0,0 +1 @@ +Unpin attrs dependency. diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 2113c620c6..989523c823 100644 --- 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", |