diff options
| author | Erik Johnston <erik@matrix.org> | 2022-02-22 12:26:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2022-02-22 12:26:17 +0000 |
| commit | 07f82ac29be42098ab5b135cb173437f9cd7c754 (patch) | |
| tree | 52ede505210af0dd06421e9644fa09705d4703cd /synapse/python_dependencies.py | |
| parent | Recommend upgrading treq alongside twisted (#11943) (diff) | |
| parent | Update changelog (diff) | |
| download | synapse-07f82ac29be42098ab5b135cb173437f9cd7c754.tar.xz | |
Merge branch 'release-v1.53'
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 80786464c2..86162e0f2c 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ # 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 - "frozendict>=1,<2.1.2", + "frozendict>=1,!=2.1.2", "unpaddedbase64>=1.1.0", "canonicaljson>=1.4.0", # we use the type definitions added in signedjson 1.1. @@ -76,8 +76,7 @@ REQUIREMENTS = [ "msgpack>=0.5.2", "phonenumbers>=8.2.0", # we use GaugeHistogramMetric, which was added in prom-client 0.4.0. - # 0.13.0 has an incorrect type annotation, see #11832. - "prometheus_client>=0.4.0,<0.13.0", + "prometheus_client>=0.4.0", # we use `order`, which arrived in attrs 19.2.0. # Note: 21.1.0 broke `/sync`, see #9936 "attrs>=19.2.0,!=21.1.0", @@ -89,7 +88,7 @@ REQUIREMENTS = [ # with the latest security patches. "cryptography>=3.4.7", "ijson>=3.1", - "matrix-common==1.0.0", + "matrix-common~=1.1.0", ] CONDITIONAL_REQUIREMENTS = { |