From: Daira Hopwood <daira@jacaranda.org>
Date: Fri, 17 Apr 2015 18:22:15 +0000 (+0100)
Subject: Add dependency on our fork of txAWS (0.2.1.post5).
X-Git-Url: https://git.rkrishnan.org/frontends/reliability?a=commitdiff_plain;h=98bec322560833b57dfe0c10fd4db11d5d09f288;p=tahoe-lafs%2Ftahoe-lafs.git

Add dependency on our fork of txAWS (0.2.1.post5).
This also makes our dependency on six unconditional, rather than only
depending on six when pyOpenSSL >= 0.14 is used.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index a42bc17b..06e3d067 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -46,6 +46,12 @@ install_requires = [
 
     # pycryptopp-0.6.0 includes ed25519
     "pycryptopp >= 0.6.0",
+
+    # needed for cloud backend
+    "txAWS == 0.2.1.post5",
+
+    # needed for cloud backend; also latest cryptography depends on this version
+    "six >= 1.4.1",
 ]
 
 # Includes some indirect dependencies, but does not include allmydata.
@@ -65,6 +71,9 @@ package_imports = [
     ('pycrypto',         'Crypto'),
     ('pyasn1',           'pyasn1'),
     ('mock',             'mock'),
+    ('txAWS',            'txaws'),
+    ('python-dateutil',  'dateutil'),
+    ('six',              'six'),
 ]
 
 # Dependencies for which we don't know how to get a version number at run-time.
@@ -205,7 +214,6 @@ if _can_use_pyOpenSSL_0_14:
         #
         "cryptography",
         "cffi >= 0.8",          # latest cryptography depends on this version
-        "six >= 1.4.1",         # latest cryptography depends on this version
         "enum34",               # latest cryptography depends on this
         "pycparser",            # cffi depends on this
     ]
@@ -213,7 +221,6 @@ if _can_use_pyOpenSSL_0_14:
     package_imports += [
         ('cryptography',     'cryptography'),
         ('cffi',             'cffi'),
-        ('six',              'six'),
         ('enum34',           'enum'),
         ('pycparser',        'pycparser'),
     ]