diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-08-24 11:55:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 11:55:52 +0100 |
| commit | e94cdbaecfaf455de67caf60ea6092587000247b (patch) | |
| tree | 75450aadeaa5782c5b399bc312c5de19050baaaf | |
| parent | Merge pull request #3749 from matrix-org/erikj/add_trial_users (diff) | |
| parent | changelog (diff) | |
| download | synapse-e94cdbaecfaf455de67caf60ea6092587000247b.tar.xz | |
Merge pull request #3751 from matrix-org/rav/twisted_17
Pin to twisted 17.1 or later
| -rw-r--r-- | changelog.d/3751.feature | 1 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/3751.feature b/changelog.d/3751.feature new file mode 100644 index 0000000000..dc9742b15b --- /dev/null +++ b/changelog.d/3751.feature @@ -0,0 +1 @@ +Require twisted 17.1 or later (fixes [#3741](https://github.com/matrix-org/synapse/issues/3741)). diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 987eec3ef2..9c55e79ef5 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -39,7 +39,7 @@ REQUIREMENTS = { "signedjson>=1.0.0": ["signedjson>=1.0.0"], "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], - "Twisted>=16.0.0": ["twisted>=16.0.0"], + "Twisted>=17.1.0": ["twisted>=17.1.0"], # We use crypto.get_elliptic_curve which is only supported in >=0.15 "pyopenssl>=0.15": ["OpenSSL>=0.15"], |