summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2022-07-04 17:47:44 +0100
committerBrendan Abolivier <babolivier@matrix.org>2022-07-04 17:47:51 +0100
commitdcc4e0621cc101271efc573600bd7591a12cea7c (patch)
treee1fa831b77cc1db7f1a3688011e98a65bbf9f14b
parentMerge tag 'v1.62.0rc3' into develop (diff)
downloadsynapse-dcc4e0621cc101271efc573600bd7591a12cea7c.tar.xz
Up the dependency on canonicaljson to ^1.5.0
-rw-r--r--pyproject.toml4
1 files changed, 3 insertions, 1 deletions
diff --git a/pyproject.toml b/pyproject.toml
index b9f2ea432c..c098b8df03 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -110,7 +110,9 @@ jsonschema = ">=3.0.0"
 frozendict = ">=1,!=2.1.2"
 # We require 2.1.0 or higher for type hints. Previous guard was >= 1.1.0
 unpaddedbase64 = ">=2.1.0"
-canonicaljson = "^1.4.0"
+# We require 1.5.0 to work around an issue when running against the C implementation of
+# frozendict: https://github.com/matrix-org/python-canonicaljson/issues/36
+canonicaljson = "^1.5.0"
 # we use the type definitions added in signedjson 1.1.
 signedjson = "^1.1.0"
 # validating SSL certs for IP addresses requires service_identity 18.1.