From 89c11d63f194afa0e428a99d1a35f81f51cb06c4 Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Sun, 17 Jul 2011 04:42:26 -0700 Subject: [PATCH] setup: remove the dependency on foolscap's "secure_connections" extra, add a dependency on pyOpenSSL fixes #1383 --- src/allmydata/_auto_deps.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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", -- 2.45.2