From 0fefab66514ac10acaed754793df3106fca4c4a8 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 14 Mar 2014 11:37:24 -0700 Subject: [PATCH] Require a recent enough version of pycrypto and see that playbook and vault ues it. --- bin/ansible-playbook | 3 +++ bin/ansible-vault | 3 +++ setup.py | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/ansible-playbook b/bin/ansible-playbook index 5aa020a9245..8714f95ab9e 100755 --- a/bin/ansible-playbook +++ b/bin/ansible-playbook @@ -18,6 +18,9 @@ ####################################################### +__requires__ = ['ansible'] +import pkg_resources + import sys import os import stat diff --git a/bin/ansible-vault b/bin/ansible-vault index 2c8094d13b1..a2f40362a14 100755 --- a/bin/ansible-vault +++ b/bin/ansible-vault @@ -20,6 +20,9 @@ # example playbook to bootstrap this script in the examples/ dir which # installs ansible and sets it up to run on cron. +__requires__ = ['ansible'] +import pkg_resources + import os import sys import traceback diff --git a/setup.py b/setup.py index c537ee9766c..34425e1f37b 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ setup(name='ansible', author_email='michael@ansible.com', url='http://ansible.com/', license='GPLv3', - install_requires=['paramiko', 'jinja2', "PyYAML"], + install_requires=['paramiko', 'jinja2', "PyYAML", 'setuptools', 'pycrypto >= 2.6'], package_dir={ 'ansible': 'lib/ansible' }, packages=[ 'ansible',