From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Sun, 17 Jul 2011 11:42:26 +0000 (-0700)
Subject: setup: remove the dependency on foolscap's "secure_connections" extra, add a dependen... 
X-Git-Url: https://git.rkrishnan.org/module-simplejson.decoder.html?a=commitdiff_plain;h=89c11d63f194afa0e428a99d1a35f81f51cb06c4;p=tahoe-lafs%2Ftahoe-lafs.git

setup: remove the dependency on foolscap's "secure_connections" extra, add a dependency on pyOpenSSL
fixes #1383
---

diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 45a6f240..e8ff4bc7 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -23,7 +23,16 @@ install_requires = [
     # of size N.
     # foolscap < 0.6 is incompatible with Twisted 10.2.0.
     # foolscap 0.6.1 quiets a DeprecationWarning.
-    "foolscap[secure_connections] >= 0.6.1",
+    # pyOpenSSL is required by foolscap for it (foolscap) to provide secure
+    # connections. Foolscap doesn't reliably declare this dependency in a
+    # machine-readable way, so we need to declare a dependency on pyOpenSSL
+    # ourselves. Tahoe-LAFS doesn't *really* depend directly on pyOpenSSL,
+    # so if something changes in the relationship between foolscap and
+    # pyOpenSSL, such as foolscap requiring a specific version of pyOpenSSL,
+    # or foolscap switching from pyOpenSSL to a different crypto library, we
+    # need to update this declaration here.
+    "foolscap >= 0.6.1",
+    "pyOpenSSL",
 
     "Nevow >= 0.6.0",