From e923fc20bda436a894301350ac9ab2b4bb942e18 Mon Sep 17 00:00:00 2001 From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Date: Thu, 5 May 2022 14:51:15 +0100 Subject: [PATCH 1/5] Include extra dependency groups 'systemd' and 'cache_memory' in debian packages (#12640) Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> --- debian/build_virtualenv | 7 ++++++- debian/changelog | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/build_virtualenv b/debian/build_virtualenv index b068792592..d2955f7628 100755 --- a/debian/build_virtualenv +++ b/debian/build_virtualenv @@ -37,7 +37,12 @@ python3 -m venv "$TEMP_VENV" source "$TEMP_VENV/bin/activate" pip install -U pip pip install poetry==1.2.0b1 -poetry export --extras all --extras test -o exported_requirements.txt +poetry export \ + --extras all \ + --extras test \ + --extras systemd \ + --extras cache_memory \ + -o exported_requirements.txt deactivate rm -rf "$TEMP_VENV" diff --git a/debian/changelog b/debian/changelog index 53b2387776..c828514752 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +matrix-synapse-py3 (1.58.0+nmu1) UNRELEASED; urgency=medium + + * Include python dependencies from the `systemd` and `cache_memory` extras package groups, which + were incorrectly omitted from the 1.58.0 package. + + -- Synapse Packaging team Thu, 05 May 2022 12:26:36 +0100 + matrix-synapse-py3 (1.58.0) stable; urgency=medium * New Synapse release 1.58.0. From 6a17a291a6692bc2a0d48ea052478f4014a19281 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 5 May 2022 15:05:58 +0100 Subject: [PATCH 2/5] 1.58.1 --- CHANGES.md | 11 +++++++++++ debian/changelog | 5 +++-- pyproject.toml | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 31f1561274..d221a37faf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,14 @@ +Synapse 1.58.1 (2022-05-05) +=========================== + +This patch release includes a fix to the Debian packages, installing the +`systemd` and `cache_memory` extra package groups, which were incorrectly +omitted in v1.58.0. This primarily prevented Synapse from starting +when the `systemd.journal.JournalHandler` log handler was configured. + +No significant changes since 1.58.0. + + Synapse 1.58.0 (2022-05-03) =========================== diff --git a/debian/changelog b/debian/changelog index c828514752..5440f91bc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -matrix-synapse-py3 (1.58.0+nmu1) UNRELEASED; urgency=medium +matrix-synapse-py3 (1.58.1) stable; urgency=medium * Include python dependencies from the `systemd` and `cache_memory` extras package groups, which were incorrectly omitted from the 1.58.0 package. + * New Synapse release 1.58.1. - -- Synapse Packaging team Thu, 05 May 2022 12:26:36 +0100 + -- Synapse Packaging team Thu, 05 May 2022 14:58:23 +0100 matrix-synapse-py3 (1.58.0) stable; urgency=medium diff --git a/pyproject.toml b/pyproject.toml index f0f029f016..4167abb233 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ skip_gitignore = true [tool.poetry] name = "matrix-synapse" -version = "1.58.0" +version = "1.58.1" description = "Homeserver for the Matrix decentralised comms protocol" authors = ["Matrix.org Team and Contributors "] license = "Apache-2.0" From d2784b6567ccfdb08d017d3f83a6d5c1b42cc8f3 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 5 May 2022 15:06:39 +0100 Subject: [PATCH 3/5] Minor wording change to v1.58.1 release notes --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index d221a37faf..c046e96eb1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,7 +6,7 @@ This patch release includes a fix to the Debian packages, installing the omitted in v1.58.0. This primarily prevented Synapse from starting when the `systemd.journal.JournalHandler` log handler was configured. -No significant changes since 1.58.0. +Otherwise, no significant changes since 1.58.0. Synapse 1.58.0 (2022-05-03) From bc149a18f6b5e12792e14c295f294adda39cffc8 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 5 May 2022 15:10:24 +0100 Subject: [PATCH 4/5] link to relevant bug report in v1.58.1 changelog --- CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index c046e96eb1..07541c803c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,7 +4,8 @@ Synapse 1.58.1 (2022-05-05) This patch release includes a fix to the Debian packages, installing the `systemd` and `cache_memory` extra package groups, which were incorrectly omitted in v1.58.0. This primarily prevented Synapse from starting -when the `systemd.journal.JournalHandler` log handler was configured. +when the `systemd.journal.JournalHandler` log handler was configured +(closes [#12631](https://github.com/matrix-org/synapse/issues/12631)). Otherwise, no significant changes since 1.58.0. From 3a8ee229112697b02b876299869d7511474ecf92 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 5 May 2022 15:15:32 +0100 Subject: [PATCH 5/5] Update v1.58.1 changelog entry with more familiar language --- CHANGES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 07541c803c..982f09b1db 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,8 +4,8 @@ Synapse 1.58.1 (2022-05-05) This patch release includes a fix to the Debian packages, installing the `systemd` and `cache_memory` extra package groups, which were incorrectly omitted in v1.58.0. This primarily prevented Synapse from starting -when the `systemd.journal.JournalHandler` log handler was configured -(closes [#12631](https://github.com/matrix-org/synapse/issues/12631)). +when the `systemd.journal.JournalHandler` log handler was configured. +See [#12631](https://github.com/matrix-org/synapse/issues/12631) for further information. Otherwise, no significant changes since 1.58.0.