From 898f5e92b16aa646e3f8d4dfeb864ac2161b4b82 Mon Sep 17 00:00:00 2001 From: Justin Riley Date: Sat, 23 Oct 2010 14:15:41 -0400 Subject: [PATCH] add hashlib to install_requires in setup.py (py24) --- setup.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index d39d400f6e..042171d688 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. @@ -28,18 +28,27 @@ except ImportError: from distutils.core import setup +import sys + from boto import Version +install_requires = [] +maj, min, micro, rel, serial = sys.version_info +if (maj, min) == (2, 4): + # boto needs hashlib module which is not in py2.4 + install_requires.append("hashlib") + setup(name = "boto", version = Version, description = "Amazon Web Services Library", long_description="Python interface to Amazon's Web Services.", author = "Mitch Garnaat", author_email = "mitch@garnaat.com", - scripts = ["bin/sdbadmin", "bin/elbadmin", "bin/cfadmin", - "bin/s3put", "bin/fetch_file", "bin/launch_instance", - "bin/list_instances", "bin/taskadmin", "bin/kill_instance", + scripts = ["bin/sdbadmin", "bin/elbadmin", "bin/cfadmin", + "bin/s3put", "bin/fetch_file", "bin/launch_instance", + "bin/list_instances", "bin/taskadmin", "bin/kill_instance", "bin/bundle_image", "bin/pyami_sendmail", "bin/lss3", "bin/cq"], + install_requires=install_requires, url = "http://code.google.com/p/boto/", packages = [ 'boto', 'boto.sqs', 'boto.s3', 'boto.gs', 'boto.file', 'boto.ec2', 'boto.ec2.cloudwatch', 'boto.ec2.autoscale', 'boto.ec2.elb',