Merge pull request #3804 from matrix-org/rav/fix_openssl_dep

bump dep on pyopenssl to 16.x
6 years ago · 135f3b4390
parent 2608ebc04c b3c2ebba32
commit 135f3b4390
2 changed files with 3 additions and 2 deletions
--- a/changelog.d/3804.bugfix
+++ b/changelog.d/3804.bugfix
@ -0,0 +1 @@
+Bump dependency on pyopenssl 16.x, to avoid incompatibility with recent Twisted.
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@ -42,8 +42,8 @@ REQUIREMENTS = {
    "Twisted>=17.1.0": ["twisted>=17.1.0"],
    "treq>=15.1": ["treq>=15.1"],

-    # We use crypto.get_elliptic_curve which is only supported in >=0.15
-    "pyopenssl>=0.15": ["OpenSSL>=0.15"],
+    # Twisted has required pyopenssl 16.0 since about Twisted 16.6.
+    "pyopenssl>=16.0.0": ["OpenSSL>=16.0.0"],

    "pyyaml": ["yaml"],
    "pyasn1": ["pyasn1"],
				`@ -0,0 +1 @@`
				`Bump dependency on pyopenssl 16.x, to avoid incompatibility with recent Twisted.`