diff options
| author | Erik Johnston <erik@matrix.org> | 2020-12-09 11:26:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-12-09 11:26:48 +0000 |
| commit | adfc9cb53dc81a0eae06aea740a0ca4708cbdc0c (patch) | |
| tree | 77a5a7117f7978aec7e47775688e89d90c74fbe8 /synapse | |
| parent | Add X-Robots-Tag header to stop crawlers from indexing media (#8887) (diff) | |
| parent | 1.24.0 (diff) | |
| download | synapse-adfc9cb53dc81a0eae06aea740a0ca4708cbdc0c.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 2e354f2cc6..f2d3ac68eb 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.24.0rc2" +__version__ = "1.24.0" 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 diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index c899ca14d3..c97e0df1f5 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -96,7 +96,11 @@ CONDITIONAL_REQUIREMENTS = { # python 3.5.2, as per https://github.com/itamarst/eliot/issues/418 'eliot<1.8.0;python_version<"3.5.3"', ], - "saml2": ["pysaml2>=4.5.0"], + "saml2": [ + # pysaml2 6.4.0 is incompatible with Python 3.5 (see https://github.com/IdentityPython/pysaml2/issues/749) + "pysaml2>=4.5.0,<6.4.0;python_version<'3.6'", + "pysaml2>=4.5.0;python_version>='3.6'", + ], "oidc": ["authlib>=0.14.0"], "systemd": ["systemd-python>=231"], "url_preview": ["lxml>=3.5.0"], |