From 266370cabc5be94be868a3a976d2bf1b3e2bf6ae Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Tue, 14 Mar 2023 18:40:43 +0000
Subject: [PATCH] [REVERT ME]: test against new canonicaljson

---
 poetry.lock    | 17 +++++++++--------
 pyproject.toml |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 56d09802a5a4..5522db43b82d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -165,17 +165,18 @@ description = "Canonical JSON"
 category = "main"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "canonicaljson-1.6.5-py3-none-any.whl", hash = "sha256:806ea6f2cbb7405d20259e1c36dd1214ba5c242fa9165f5bd0bf2081f82c23fb"},
-    {file = "canonicaljson-1.6.5.tar.gz", hash = "sha256:68dfc157b011e07d94bf74b5d4ccc01958584ed942d9dfd5fdd706609e81cd4b"},
-]
+files = []
+develop = false
 
 [package.dependencies]
 simplejson = ">=3.14.0"
-typing-extensions = {version = ">=4.0.0", markers = "python_version < \"3.8\""}
+typing_extensions = {version = ">=4.0.0", markers = "python_version < \"3.8\""}
 
-[package.extras]
-frozendict = ["frozendict (>=1.0)"]
+[package.source]
+type = "git"
+url = "https://github.com/matrix-org/python-canonicaljson.git"
+reference = "07dcccdc5e74280371a5d82edc4cd84b4b201a99"
+resolved_reference = "07dcccdc5e74280371a5d82edc4cd84b4b201a99"
 
 [[package]]
 name = "certifi"
@@ -2997,4 +2998,4 @@ user-search = ["pyicu"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.7.1"
-content-hash = "d80e0a2a645cb4e461adacfded57400394d95acc464793eee4439023651fd30b"
+content-hash = "f44c4cefbf0fc6bfc9ee438df9f0e90339f69d51747172981dc844e66a0bfb0f"
diff --git a/pyproject.toml b/pyproject.toml
index 7c1a6d680e31..a67d24c1cee2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -160,7 +160,7 @@ immutabledict = ">=2.0"
 unpaddedbase64 = ">=2.1.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"
+canonicaljson = {git = "https://github.com/matrix-org/python-canonicaljson.git", rev = "07dcccdc5e74280371a5d82edc4cd84b4b201a99"}
 # 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.