Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Up the dependency on canonicaljson to ^1.5.0 #13172

Merged
merged 6 commits into from
Jul 18, 2022
Merged

Up the dependency on canonicaljson to ^1.5.0 #13172

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cdffc1
Up the dependency on canonicaljson to ^1.5.0
babolivier Jul 4, 2022
1553fb5
Changelog
babolivier Jul 4, 2022
80de33e
Lock
babolivier Jul 4, 2022
431231c
Try to create lock under poetry 1.1.12
Jul 4, 2022
d766b97
Merge branch 'develop' of github.com:matrix-org/synapse into babolivi…
babolivier Jul 6, 2022
4f730e0
Merge branch 'babolivier/canonicaljson' of github.com:matrix-org/syna…
babolivier Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/13172.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Always use a version of canonicaljson that supports the C implementation of frozendict.
68 changes: 47 additions & 21 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down