1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Merge branch 'abadger-feature/multi-version-import' into devel

This commit is contained in:
James Cammarata 2014-04-29 14:54:23 -05:00
commit 3416c33026
4 changed files with 22 additions and 2 deletions

View file

@ -18,6 +18,9 @@
#######################################################
__requires__ = ['ansible']
import pkg_resources
import sys
import os
import stat

View file

@ -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

View file

@ -25,6 +25,12 @@ Requires: python26-paramiko
Requires: python26-jinja2
Requires: python26-keyczar
Requires: python26-httplib2
Requires: python26-setuptools
%endif
# RHEL == 6
%if 0%{?rhel} == 6
Requires: python-crypto2.6
%endif
# RHEL > 5
@ -35,6 +41,7 @@ Requires: python-paramiko
Requires: python-jinja2
Requires: python-keyczar
Requires: python-httplib2
Requires: python-setuptools
%endif
# FEDORA > 17
@ -45,6 +52,7 @@ Requires: python-paramiko
Requires: python-jinja2
Requires: python-keyczar
Requires: python-httplib2
Requires: python-setuptools
%endif
# SuSE/openSuSE
@ -56,6 +64,7 @@ Requires: python-jinja2
Requires: python-keyczar
Requires: python-yaml
Requires: python-httplib2
Requires: python-setuptools
%endif
Requires: sshpass

View file

@ -6,7 +6,12 @@ from glob import glob
sys.path.insert(0, os.path.abspath('lib'))
from ansible import __version__, __author__
from distutils.core import setup
try:
from setuptools import setup
except ImportError:
print "Ansible now needs setuptools in order to build. " + \
"Install it using your package manager (usually python-setuptools) or via pip (pip install setuptools)."
sys.exit(1)
# find library modules
from ansible.constants import DEFAULT_MODULE_PATH
@ -29,7 +34,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',