From 8c92b50a3339a7ddd175d70ea309e89f0bf9c8e2 Mon Sep 17 00:00:00 2001 From: David-Sarah Hopwood Date: Wed, 12 Dec 2012 05:56:45 +0000 Subject: [PATCH] Add dependency on our fork of txAWS (0.2.1.post5). Add 'six' to ignorable package list because it is a dependency of txAWS via python-dateutil. Signed-off-by: David-Sarah Hopwood --- src/allmydata/__init__.py | 2 +- src/allmydata/_auto_deps.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py index 4bafed47..78e157d5 100644 --- a/src/allmydata/__init__.py +++ b/src/allmydata/__init__.py @@ -283,7 +283,7 @@ def cross_check(pkg_resources_vers_and_locs, imported_vers_and_locs_list): errors = [] not_pkg_resourceable = set(['python', 'platform', __appname__.lower()]) not_import_versionable = set(['zope.interface', 'mock', 'pyasn1']) - ignorable = set(['argparse', 'pyutil', 'zbase32', 'distribute', 'twisted-web', 'twisted-core', 'twisted-conch']) + ignorable = set(['argparse', 'pyutil', 'zbase32', 'distribute', 'twisted-web', 'twisted-core', 'twisted-conch', 'six']) for name, (imp_ver, imp_loc, imp_comment) in imported_vers_and_locs_list: name = name.lower() diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py index b7be3212..61ad3aef 100644 --- a/src/allmydata/_auto_deps.py +++ b/src/allmydata/_auto_deps.py @@ -24,8 +24,8 @@ install_requires = [ # the drop-upload frontend. # * We also need Twisted 10.1 for the FTP frontend in order for Twisted's # FTP server to support asynchronous close. - # * When the cloud backend lands, it will depend on Twisted 10.2.0 which - # includes the fix to https://twistedmatrix.com/trac/ticket/411 + # * The cloud backend depends on Twisted 10.2.0 which includes the fix to + # https://twistedmatrix.com/trac/ticket/411 # * The SFTP frontend depends on Twisted 11.0.0 to fix the SSH server # rekeying bug http://twistedmatrix.com/trac/ticket/4395 # @@ -64,6 +64,9 @@ install_requires = [ # pycryptopp-0.6.0 includes ed25519 "pycryptopp >= 0.6.0", + # needed for cloud backend + "txAWS == 0.2.1.post5", + # Will be needed to test web apps, but not yet. See #1001. #"windmill >= 1.3", ] @@ -85,6 +88,8 @@ package_imports = [ ('pycrypto', 'Crypto'), ('pyasn1', 'pyasn1'), ('mock', 'mock'), + ('txAWS', 'txaws'), + ('python-dateutil', 'dateutil'), ] def require_more(): -- 2.45.2