Bundle a new version of python-six for compatibility along with some code to make it easy for distributions to override the bunndled copy if they have a new enough version.six-compat

1 files changed, 3 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 7ada3f7f97..f174f979f8 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,9 @@ setup(name='ansible',
       author_email='support@ansible.com',
       url='http://ansible.com/',
       license='GPLv3',
-      install_requires=['paramiko', 'jinja2', "PyYAML", 'setuptools', 'pycrypto >= 2.6', 'six'],
+      # Ansible will also make use of a system copy of python-six if installed but use a
+      # Bundled copy if it's not.
+      install_requires=['paramiko', 'jinja2', "PyYAML", 'setuptools', 'pycrypto >= 2.6'],
       package_dir={ '': 'lib' },
       packages=find_packages('lib'),
       package_data={