diff options
| author | Pascal Bach <pascal.bach@nextrem.ch> | 2022-02-14 22:18:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-14 21:18:01 +0000 |
| commit | c4c98c75188015b7ee921ee0adc2c428fbb9b6b4 (patch) | |
| tree | c07470d9c68b4646741e2c12b7ddc58e7ccfaf11 | |
| parent | Fix M_WRONG_ROOM_KEYS_VERSION error not including `current_version` field (#1... (diff) | |
| download | synapse-c4c98c75188015b7ee921ee0adc2c428fbb9b6b4.tar.xz | |
Revert "Pin to frozendict<2.1.2 (#11625)" and allow frozendict>2.1.2 (#11969)
This reverts commit 2bf31f7807c7a0c229170803c97090d612dc16f9. Signed-off-by: Pascal Bach <pascal.bach@nextrem.ch>
| -rw-r--r-- | changelog.d/11969.misc | 1 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/11969.misc b/changelog.d/11969.misc new file mode 100644 index 0000000000..60a12d4032 --- /dev/null +++ b/changelog.d/11969.misc @@ -0,0 +1 @@ +Unpin frozendict but exclude the known bad version 2.1.2. diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 4f99096df3..86162e0f2c 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ # we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0 "jsonschema>=3.0.0", # frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41 - "frozendict>=1,<2.1.2", + "frozendict>=1,!=2.1.2", "unpaddedbase64>=1.1.0", "canonicaljson>=1.4.0", # we use the type definitions added in signedjson 1.1. |