diff options
| author | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2022-04-20 17:44:19 +0100 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2022-04-20 17:44:19 +0100 |
| commit | 01c8f9ca6951f5f666c30f5cfd72828419944a5b (patch) | |
| tree | 8b74bdcd87e237135fccf8d1a50a2879b527b791 | |
| parent | Dump setuptools; correct pyproject version number (#12478) (diff) | |
| parent | Clarify changelog entry (diff) | |
| download | synapse-01c8f9ca6951f5f666c30f5cfd72828419944a5b.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.md | 15 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | poetry.lock | 12 | ||||
| -rw-r--r-- | pyproject.toml | 2 |
4 files changed, 30 insertions, 5 deletions
diff --git a/CHANGES.md b/CHANGES.md index 74a5dbf424..a7d2529b55 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,18 @@ +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][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. 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) =========================== diff --git a/debian/changelog b/debian/changelog index a46bb2bba3..05e6bd75a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,12 @@ matrix-synapse-py3 (1.58.0+nmu1) UNRELEASED; urgency=medium -- Synapse Packaging team <packages@matrix.org> Wed, 30 Mar 2022 12:21:43 +0100 +matrix-synapse-py3 (1.57.1) stable; urgency=medium + + * New synapse release 1.57.1. + + -- Synapse Packaging team <packages@matrix.org> 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/poetry.lock b/poetry.lock index a9f3e61015..95c1afc077 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" @@ -2085,7 +2088,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"}, diff --git a/pyproject.toml b/pyproject.toml index c04857b791..c7f3e20fed 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 <packages@matrix.org>"] license = "Apache-2.0" |