tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Remove workaround introduced in Synapse v1.50.0rc1 for Mjolnir compatibility. Breaks compatibility with Mjolnir v1.3.1 and earlier. (#11700)

Browse source
This commit is contained in:
reivilibre 2022-03-10 15:53:23 +00:00 committed by GitHub
parent ea27528b5d
commit 72e7f1c420
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/11700.removal Normal file
View file

@ -0,0 +1 @@
Remove workaround introduced in Synapse 1.50.0 for Mjolnir compatibility. Breaks compatibility with Mjolnir 1.3.1 and earlier.

8
docs/upgrade.md
View file

@ -106,6 +106,14 @@ You will need to ensure `synctl` is on your `PATH`.
automatically, though you might need to activate a virtual environment automatically, though you might need to activate a virtual environment
depending on how you installed Synapse. 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 # Upgrading to v1.54.0
## Legacy structured logging configuration removal ## Legacy structured logging configuration removal

7
synapse/util/__init__.py
View file

@ -31,13 +31,6 @@ from synapse.logging import context
if typing.TYPE_CHECKING: if typing.TYPE_CHECKING:
pass 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__) logger = logging.getLogger(__name__)