From 1642abd77e43c4e7a69ebd5e1076593495488df1 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 24 Mar 2022 19:13:20 +0000 Subject: [PATCH] 1.55.2 --- CHANGES.md | 12 ++++++++++++ changelog.d/12297.misc | 1 - debian/changelog | 6 ++++++ synapse/__init__.py | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/12297.misc diff --git a/CHANGES.md b/CHANGES.md index 05ca83df5d..03807a0777 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,15 @@ +Synapse 1.55.2 (2022-03-24) +=========================== + +This patch version reverts the earlier fixes from Synapse 1.55.1, which could cause problems in certain deployments, and instead adds a cap to the version of Jinja to be installed. Again, this is to fix an incompatibility with version 3.1.0 of the [Jinja](https://pypi.org/project/Jinja2/) library, and again, deployments of Synapse using the `matrixdotorg/synapse` Docker image or Debian packages from packages.matrix.org are not affected. + +Internal Changes +---------------- + +- Pin Jinja to <3.1.0, as Synapse fails to start with Jinja 3.1.0. ([\#12297](https://github.com/matrix-org/synapse/issues/12297)) +- Revert changes from 1.55.1 as they caused problems with older versions of Jinja. + + Synapse 1.55.1 (2022-03-24) =========================== diff --git a/changelog.d/12297.misc b/changelog.d/12297.misc deleted file mode 100644 index 7bf05305f6..0000000000 --- a/changelog.d/12297.misc +++ /dev/null @@ -1 +0,0 @@ -Pin Jinja to <3.1.0, as Synapse fails to start with Jinja 3.1.0. \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index f3ac279302..3c899e6024 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.55.2) stable; urgency=medium + + * New synapse release 1.55.2. + + -- Synapse Packaging team Thu, 24 Mar 2022 19:07:11 +0000 + matrix-synapse-py3 (1.55.1) stable; urgency=medium * New synapse release 1.55.1. diff --git a/synapse/__init__.py b/synapse/__init__.py index 70f56824f9..88aef1889c 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -68,7 +68,7 @@ try: except ImportError: pass -__version__ = "1.55.1" +__version__ = "1.55.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