summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-20 18:10:26 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-20 18:10:26 +0100
commit4213fe16137ee3bc1696c02d0b80f8627a078b07 (patch)
tree4b786ac47589900b27bcfe98acc9da31dfc7fa72 /synapse/python_dependencies.py
parentMerge commit '77b4711bc' into anoa/dinsic_release_1_21_x (diff)
parentBump canonicaljson to version 1.4.0 (#8262) (diff)
downloadsynapse-4213fe16137ee3bc1696c02d0b80f8627a078b07.tar.xz
Merge commit '7586fdf1e' into anoa/dinsic_release_1_21_x
* commit '7586fdf1e':
  Bump canonicaljson to version 1.4.0 (#8262)
  Run database updates in a transaction (#8265)
  Add tests for `last_successful_stream_ordering` (#8258)
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index 2d995ec456..ff0c67228b 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -43,7 +43,7 @@ REQUIREMENTS = [ "jsonschema>=2.5.1", "frozendict>=1", "unpaddedbase64>=1.1.0", - "canonicaljson>=1.3.0", + "canonicaljson>=1.4.0", # we use the type definitions added in signedjson 1.1. "signedjson>=1.1.0", "pynacl>=1.2.1",