Use canonicaljson >= 1.2.0

matrix-org · Jul 27, 2020 · 3728c19 · 3728c19
1 parent 9b1a128
commit 3728c19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/changelog.d/7936.misc b/changelog.d/7936.misc
@@ -1 +1 @@
-Switch to the JSON implementation from the standard library.
+Switch to the JSON implementation from the standard library and bump the minimum version of the canonicaljson library to 1.2.0.
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
@@ -43,8 +43,7 @@
     "jsonschema>=2.5.1",
     "frozendict>=1",
     "unpaddedbase64>=1.1.0",
-    # TODO This will require canonicaljson >= 1.2.0.
-    "canonicaljson@https://github.com/matrix-org/python-canonicaljson/archive/clokep/chooseable-json.zip",
+    "canonicaljson>=1.2.0",
     # we use the type definitions added in signedjson 1.1.
     "signedjson>=1.1.0",
     "pynacl>=1.2.1",