Up the dependency on canonicaljson to ^1.5.0 (#13172)

babolivier · David Robertson · web-flow · commit 8c60c572f011 · 2022-07-18T17:30:59.000+02:00
Co-authored-by: David Robertson &lt;davidr@element.io&gt;
diff --git a/changelog.d/13172.misc b/changelog.d/13172.misc
@@ -0,0 +1 @@
+Always use a version of canonicaljson that supports the C implementation of frozendict.
diff --git a/poetry.lock b/poetry.lock
diff --git 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.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Always use a version of canonicaljson that supports the C implementation of frozendict.`