summarylogtreecommitdiffstats
path: root/deps-relax-checks.patch
diff options
context:
space:
mode:
Diffstat (limited to 'deps-relax-checks.patch')
-rw-r--r--deps-relax-checks.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/deps-relax-checks.patch b/deps-relax-checks.patch
new file mode 100644
index 000000000000..cde624b742d2
--- /dev/null
+++ b/deps-relax-checks.patch
@@ -0,0 +1,38 @@
+From 728c3a13ef41e002995033f3e82938d4c72bd297 Mon Sep 17 00:00:00 2001
+From: Ivan Shapovalov <intelfx@intelfx.name>
+Date: Thu, 11 Feb 2016 22:55:01 +0300
+Subject: [PATCH] python_dependencies.py: relax versioned deps on pynacl and
+ pysaml2.
+
+Revert "Pin pysaml2 version to 3.x"
+
+This reverts commit 07cf96ebf7c806ba570d167e200e54e07034f5ce.
+---
+ synapse/python_dependencies.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
+index 86e3d89..9eca07d 100644
+--- a/synapse/python_dependencies.py
++++ b/synapse/python_dependencies.py
+@@ -22,7 +22,7 @@ REQUIREMENTS = {
+ "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"],
+ "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"],
+ "signedjson>=1.0.0": ["signedjson>=1.0.0"],
+- "pynacl==0.3.0": ["nacl==0.3.0", "nacl.bindings"],
++ "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"],
+ "service_identity>=1.0.0": ["service_identity>=1.0.0"],
+ "Twisted>=15.1.0": ["twisted>=15.1.0"],
+ "pyopenssl>=0.14": ["OpenSSL>=0.14"],
+@@ -34,7 +34,7 @@ REQUIREMENTS = {
+ "pydenticon": ["pydenticon"],
+ "ujson": ["ujson"],
+ "blist": ["blist"],
+- "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"],
++ "pysaml2": ["saml2"],
+ "pymacaroons-pynacl": ["pymacaroons"],
+ }
+ CONDITIONAL_REQUIREMENTS = {
+--
+2.9.2
+