diff options
| author | reivilibre <oliverw@matrix.org> | 2022-03-10 15:53:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-10 15:53:23 +0000 |
| commit | 72e7f1c420b879a0a1ef1430771698b868693ab0 (patch) | |
| tree | 6ce478f37dd331c8af05fd0c3f2becbfd43cb185 | |
| parent | Support stable identifiers for MSC3440: Threading (#12151) (diff) | |
| download | synapse-72e7f1c420b879a0a1ef1430771698b868693ab0.tar.xz | |
Remove workaround introduced in Synapse v1.50.0rc1 for Mjolnir compatibility. Breaks compatibility with Mjolnir v1.3.1 and earlier. (#11700)
| -rw-r--r-- | changelog.d/11700.removal | 1 | ||||
| -rw-r--r-- | docs/upgrade.md | 8 | ||||
| -rw-r--r-- | synapse/util/__init__.py | 7 |
3 files changed, 9 insertions, 7 deletions
diff --git a/changelog.d/11700.removal b/changelog.d/11700.removal new file mode 100644 index 0000000000..d3d3c48f0f --- /dev/null +++ b/changelog.d/11700.removal @@ -0,0 +1 @@ +Remove workaround introduced in Synapse 1.50.0 for Mjolnir compatibility. Breaks compatibility with Mjolnir 1.3.1 and earlier. diff --git a/docs/upgrade.md b/docs/upgrade.md index 0d0bb066ee..95005962dc 100644 --- a/docs/upgrade.md +++ b/docs/upgrade.md @@ -106,6 +106,14 @@ You will need to ensure `synctl` is on your `PATH`. automatically, though you might need to activate a virtual environment depending on how you installed Synapse. + +## Compatibility dropped for Mjolnir 1.3.1 and earlier + +Synapse v1.55.0 drops support for Mjolnir 1.3.1 and earlier. +If you use the Mjolnir module to moderate your homeserver, +please upgrade Mjolnir to version 1.3.2 or later before upgrading Synapse. + + # Upgrading to v1.54.0 ## Legacy structured logging configuration removal diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index 58b4220ff3..d8046b7553 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -31,13 +31,6 @@ from synapse.logging import context if typing.TYPE_CHECKING: pass -# FIXME Mjolnir imports glob_to_regex from this file, but it was moved to -# matrix_common. -# As a temporary workaround, we import glob_to_regex here for -# compatibility with current versions of Mjolnir. -# See https://github.com/matrix-org/mjolnir/pull/174 -from matrix_common.regex import glob_to_regex # noqa - logger = logging.getLogger(__name__) |