diff options
| author | Sean Quah <seanq@element.io> | 2022-04-05 15:14:53 +0100 |
|---|---|---|
| committer | Sean Quah <seanq@element.io> | 2022-04-05 15:14:53 +0100 |
| commit | ab3fdcf9602353c7f31f8487fb6909bb3f0cde1f (patch) | |
| tree | b90c8e750acfacfe03d3d7ae56e888c2372f0e9f /synapse | |
| parent | Convert `Linearizer` tests from `inlineCallbacks` to async (#12353) (diff) | |
| parent | Tweak CHANGES.md (diff) | |
| download | synapse-ab3fdcf9602353c7f31f8487fb6909bb3f0cde1f.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 0960305d79..2e6510537f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -68,7 +68,7 @@ try: except ImportError: pass -__version__ = "1.56.0rc1" +__version__ = "1.56.0" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 8419ab3aca..d02cca0bbb 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -48,7 +48,7 @@ REQUIREMENTS = [ "unpaddedbase64>=1.1.0", "canonicaljson>=1.4.0", # we use the type definitions added in signedjson 1.1. - "signedjson>=1.1.0", + "signedjson>=1.1.0,<=1.1.1", "pynacl>=1.2.1", "idna>=2.5", # validating SSL certs for IP addresses requires service_identity 18.1. |