diff options
| author | David Robertson <davidr@element.io> | 2023-03-22 17:15:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-22 17:15:34 +0000 |
| commit | 3b0083c92adf76daf4161908565de9e5efc08074 (patch) | |
| tree | cc8e3883ec269a1153cd40b42eee5f737d906411 /pyproject.toml | |
| parent | Merge branch 'release-v1.80' into develop (diff) | |
| download | synapse-3b0083c92adf76daf4161908565de9e5efc08074.tar.xz | |
Use immutabledict instead of frozendict (#15113)
Additionally: * Consistently use `freeze()` in test --------- Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'pyproject.toml')
| -rw-r--r-- | pyproject.toml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pyproject.toml b/pyproject.toml index 19dc7c1536..c0111dd796 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -153,15 +153,13 @@ python = "^3.7.1" # ---------------------- # we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0 jsonschema = ">=3.0.0" -# frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41 -# We cannot test our wheels against the 2.3.5 release in CI. Putting in an upper bound for this -# because frozendict has been more trouble than it's worth; we would like to move to immutabledict. -frozendict = ">=1,!=2.1.2,<2.3.5" +# We choose 2.0 as a lower bound: the most recent backwards incompatible release. +# It seems generally available, judging by https://pkgs.org/search/?q=immutabledict +immutabledict = ">=2.0" # We require 2.1.0 or higher for type hints. Previous guard was >= 1.1.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" +# We require 2.0.0 for immutabledict support. +canonicaljson = "^2.0.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. |