diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2022-07-18 17:30:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-18 17:30:59 +0200 |
| commit | 8c60c572f011a502040b509ae648fd5cad3d4428 (patch) | |
| tree | be3a6ae9cbd3f060f23e353a0312535a98a89fc8 | |
| parent | Prevent #3679 from appearing in blame results (#13311) (diff) | |
| download | synapse-8c60c572f011a502040b509ae648fd5cad3d4428.tar.xz | |
Up the dependency on canonicaljson to ^1.5.0 (#13172)
Co-authored-by: David Robertson <davidr@element.io>
| -rw-r--r-- | changelog.d/13172.misc | 1 | ||||
| -rw-r--r-- | poetry.lock | 2 | ||||
| -rw-r--r-- | pyproject.toml | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/changelog.d/13172.misc b/changelog.d/13172.misc new file mode 100644 index 0000000000..124a1b3662 --- /dev/null +++ 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 index 3a08c9478d..41ab40edd1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1563,7 +1563,7 @@ url_preview = ["lxml"] [metadata] lock-version = "1.1" python-versions = "^3.7.1" -content-hash = "e96625923122e29b6ea5964379828e321b6cede2b020fc32c6f86c09d86d1ae8" +content-hash = "c24bbcee7e86dbbe7cdbf49f91a25b310bf21095452641e7440129f59b077f78" [metadata.files] attrs = [ diff --git a/pyproject.toml b/pyproject.toml index f77c02ca27..21bea2ba01 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. |