From 3e2e76ca1507ff6b0ed4e5095fd602b61a26704f Mon Sep 17 00:00:00 2001 From: reivilibre Date: Wed, 20 Apr 2022 15:22:53 +0100 Subject: [PATCH 1/3] Include version 0.2.0 of the Synapse LDAP Auth Provider module in the Docker image. (#12512) * poetry update matrix-synapse-ldap3 * Newsfile Signed-off-by: Olivier Wilkinson (reivilibre) --- changelog.d/12512.docker | 1 + poetry.lock | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 changelog.d/12512.docker diff --git a/changelog.d/12512.docker b/changelog.d/12512.docker new file mode 100644 index 0000000000..24c0f6a3b1 --- /dev/null +++ b/changelog.d/12512.docker @@ -0,0 +1 @@ +Include version 0.2.0 of the Synapse LDAP Auth Provider module in the Docker image. \ No newline at end of file diff --git a/poetry.lock b/poetry.lock index bbe8eba96d..c11e2c6848 100644 --- a/poetry.lock +++ b/poetry.lock @@ -558,17 +558,20 @@ test = ["tox", "twisted", "aiounittest"] [[package]] name = "matrix-synapse-ldap3" -version = "0.1.5" +version = "0.2.0" description = "An LDAP3 auth provider for Synapse" category = "main" optional = true -python-versions = "*" +python-versions = ">=3.7" [package.dependencies] ldap3 = ">=2.8" -service_identity = "*" +service-identity = "*" Twisted = ">=15.1.0" +[package.extras] +dev = ["matrix-synapse", "tox", "ldaptor", "mypy (==0.910)", "types-setuptools", "black (==21.9b0)", "flake8 (==4.0.1)", "isort (==5.9.3)"] + [[package]] name = "mccabe" version = "0.6.1" @@ -2084,7 +2087,8 @@ matrix-common = [ {file = "matrix_common-1.1.0.tar.gz", hash = "sha256:a8238748afc2b37079818367fed5156f355771b07c8ff0a175934f47e0ff3276"}, ] matrix-synapse-ldap3 = [ - {file = "matrix-synapse-ldap3-0.1.5.tar.gz", hash = "sha256:9fdf8df7c8ec756642aa0fea53b31c0b2f1924f70d7f049a2090b523125456fe"}, + {file = "matrix-synapse-ldap3-0.2.0.tar.gz", hash = "sha256:91a0715b43a41ec3033244174fca20846836da98fda711fb01687f7199eecd2e"}, + {file = "matrix_synapse_ldap3-0.2.0-py3-none-any.whl", hash = "sha256:0128ca7c3058987adc2e8a88463bb46879915bfd3d373309632813b353e30f9f"}, ] mccabe = [ {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"}, From 05e8a5d298011508e04ecf4b2f73aaa737ed6035 Mon Sep 17 00:00:00 2001 From: "Olivier Wilkinson (reivilibre)" Date: Wed, 20 Apr 2022 15:30:03 +0100 Subject: [PATCH 2/3] 1.57.1 --- CHANGES.md | 13 +++++++++++++ changelog.d/12512.docker | 1 - debian/changelog | 6 ++++++ pyproject.toml | 2 +- synapse/__init__.py | 2 +- 5 files changed, 21 insertions(+), 3 deletions(-) delete mode 100644 changelog.d/12512.docker diff --git a/CHANGES.md b/CHANGES.md index 74a5dbf424..63c66af5bf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,16 @@ +Synapse 1.57.1 (2022-04-20) +=========================== + +This is a patch release that only affects the Docker image. It is only of interest to administrators using the LDAP module to authenticate their users. +If you have already upgraded to Synapse 1.57.0 without problem, then you have no need to upgrade to this patch release. + + +Updates to the Docker image +--------------------------- + +- Include version 0.2.0 of the Synapse LDAP Auth Provider module in the Docker image. ([\#12512](https://github.com/matrix-org/synapse/issues/12512)) + + Synapse 1.57.0 (2022-04-19) =========================== diff --git a/changelog.d/12512.docker b/changelog.d/12512.docker deleted file mode 100644 index 24c0f6a3b1..0000000000 --- a/changelog.d/12512.docker +++ /dev/null @@ -1 +0,0 @@ -Include version 0.2.0 of the Synapse LDAP Auth Provider module in the Docker image. \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 71dcf9de8e..2db6ed9491 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.57.1) stable; urgency=medium + + * New synapse release 1.57.1. + + -- Synapse Packaging team Wed, 20 Apr 2022 15:27:21 +0100 + matrix-synapse-py3 (1.57.0) stable; urgency=medium * New synapse release 1.57.0. diff --git a/pyproject.toml b/pyproject.toml index 7f58c37e3f..65f5a5f59f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ skip_gitignore = true [tool.poetry] name = "matrix-synapse" -version = "1.57.0" +version = "1.57.1" description = "Homeserver for the Matrix decentralised comms protocol" authors = ["Matrix.org Team and Contributors "] license = "Apache-2.0" diff --git a/synapse/__init__.py b/synapse/__init__.py index bf88f1d93d..b62eed66e2 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -68,7 +68,7 @@ try: except ImportError: pass -__version__ = "1.57.0" +__version__ = "1.57.1" 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 From f8f06fc773e6d1dd9674be77d3e6a3665830a33a Mon Sep 17 00:00:00 2001 From: "Olivier Wilkinson (reivilibre)" Date: Wed, 20 Apr 2022 15:48:05 +0100 Subject: [PATCH 3/3] Clarify changelog entry --- CHANGES.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 63c66af5bf..a7d2529b55 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,14 +1,16 @@ Synapse 1.57.1 (2022-04-20) =========================== -This is a patch release that only affects the Docker image. It is only of interest to administrators using the LDAP module to authenticate their users. +This is a patch release that only affects the Docker image. It is only of interest to administrators using [the LDAP module][LDAPModule] to authenticate their users. If you have already upgraded to Synapse 1.57.0 without problem, then you have no need to upgrade to this patch release. +[LDAPModule]: https://github.com/matrix-org/matrix-synapse-ldap3 + Updates to the Docker image --------------------------- -- Include version 0.2.0 of the Synapse LDAP Auth Provider module in the Docker image. ([\#12512](https://github.com/matrix-org/synapse/issues/12512)) +- Include version 0.2.0 of the Synapse LDAP Auth Provider module in the Docker image. This matches the version that was present in the Docker image for Synapse v1.56.0. ([\#12512](https://github.com/matrix-org/synapse/issues/12512)) Synapse 1.57.0 (2022-04-19)