diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-12-08 13:41:25 -0500 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-12-09 10:38:46 +0000 |
| commit | 0eb9b2f86667a059f692d71d5c224c173498bb7b (patch) | |
| tree | 62c9c2c957951cff21e419a6be1eb95a3e23cafe | |
| parent | Consistently use room_id from federation request body (#8776) (diff) | |
| download | synapse-0eb9b2f86667a059f692d71d5c224c173498bb7b.tar.xz | |
Fix installing pysaml2 on Python 3.5. (#8898)
This pins pysaml2 to < 6.4.0 on Python 3.5, as the last known working version.
| -rw-r--r-- | changelog.d/8898.misc | 1 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelog.d/8898.misc b/changelog.d/8898.misc new file mode 100644 index 0000000000..bdb0d40d51 --- /dev/null +++ b/changelog.d/8898.misc @@ -0,0 +1 @@ +Add a maximum version for pysaml2 on Python 3.5. diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index aab77fc453..040f76bb53 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -99,7 +99,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"], |