From a9a41d0af89b7f97b1cd1fa69def1feb6c71e5f6 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Fri, 16 Oct 2015 17:20:57 +0100 Subject: [PATCH] Add dependency on our fork of txAWS (0.2.1.post5). Signed-off-by: Daira Hopwood --- src/allmydata/_auto_deps.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py index b6f70bf2..9e8e4e2a 100644 --- a/src/allmydata/_auto_deps.py +++ b/src/allmydata/_auto_deps.py @@ -51,6 +51,12 @@ install_requires = [ "characteristic >= 14.0.0", # latest service-identity depends on this version "pyasn1 >= 0.1.8", # latest pyasn1-modules depends on this version "pyasn1-modules >= 0.0.5", # service-identity depends on this + + # 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. @@ -73,6 +79,10 @@ package_imports = [ ('service-identity', 'service_identity'), ('characteristic', 'characteristic'), ('pyasn1-modules', 'pyasn1_modules'), + ('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. @@ -207,7 +217,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 ] @@ -215,7 +224,6 @@ if _can_use_pyOpenSSL_0_14: package_imports += [ ('cryptography', 'cryptography'), ('cffi', 'cffi'), - ('six', 'six'), ('enum34', 'enum'), ('pycparser', 'pycparser'), ] -- 2.45.2