diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-12-21 18:13:05 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-12-21 18:13:05 +0000 |
| commit | 144b9ede8994707b6fa28e0aa8b0cdafbd2f498c (patch) | |
| tree | 86ba91a8065ec42780e982cdfeda9c3169fea35f /synapse | |
| parent | Refactor `tests.util.setup_test_homeserver` and `tests.server.setup_test_home... (diff) | |
| parent | Merge branch 'release-v1.49' (diff) | |
| download | synapse-144b9ede8994707b6fa28e0aa8b0cdafbd2f498c.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 | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index d44a03a2cb..95a49c20be 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.49.0" +__version__ = "1.49.2" 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 7d26954244..13fb69460e 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -50,7 +50,8 @@ logger = logging.getLogger(__name__) REQUIREMENTS = [ # we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0 "jsonschema>=3.0.0", - "frozendict>=1", + # frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41 + "frozendict>=1,<2.1.2", "unpaddedbase64>=1.1.0", "canonicaljson>=1.4.0", # we use the type definitions added in signedjson 1.1. |