mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Partially revert "Differentiate ZeroMQ from RAET based installations."
This partially reverts commit e4179cdc68.
This commit is contained in:
Pedro Algarvio
parent
874c0f6eec
commit
b5b51fc7ed
1 changed files with 77 additions and 111 deletions
188
setup.py
188
setup.py
|
|
@ -18,11 +18,9 @@ from datetime import datetime
|
||||||
from distutils import log
|
from distutils import log
|
||||||
from distutils.cmd import Command
|
from distutils.cmd import Command
|
||||||
from distutils.command.build import build
|
from distutils.command.build import build
|
||||||
from distutils.command.check import check
|
|
||||||
from distutils.command.clean import clean
|
from distutils.command.clean import clean
|
||||||
from distutils.command.sdist import sdist
|
from distutils.command.sdist import sdist
|
||||||
from distutils.command.install_lib import install_lib
|
from distutils.command.install_lib import install_lib
|
||||||
from distutils.dist import Distribution as BaseDistribution
|
|
||||||
# pylint: enable=E0611
|
# pylint: enable=E0611
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
@ -65,7 +63,6 @@ WITH_SETUPTOOLS = False
|
||||||
if 'USE_SETUPTOOLS' in os.environ or 'setuptools' in sys.modules:
|
if 'USE_SETUPTOOLS' in os.environ or 'setuptools' in sys.modules:
|
||||||
try:
|
try:
|
||||||
from setuptools import setup
|
from setuptools import setup
|
||||||
from setuptools.dist import Distribution as BaseDistribution
|
|
||||||
from setuptools.command.install import install
|
from setuptools.command.install import install
|
||||||
from setuptools.command.sdist import sdist
|
from setuptools.command.sdist import sdist
|
||||||
WITH_SETUPTOOLS = True
|
WITH_SETUPTOOLS = True
|
||||||
|
|
@ -422,122 +419,32 @@ class InstallLib(install_lib):
|
||||||
os.chmod(filename, 0755)
|
os.chmod(filename, 0755)
|
||||||
|
|
||||||
|
|
||||||
class Check(check):
|
|
||||||
'''
|
|
||||||
Since check is always executed, or at least on most of the commands we use
|
|
||||||
we simply override it to adapt the install_requires distribution parameter
|
|
||||||
based on the chosen salt transport
|
|
||||||
'''
|
|
||||||
def run(self):
|
|
||||||
if self.distribution.salt_transport == 'zeromq':
|
|
||||||
self.distribution.install_requires.extend(_parse_requirements_file(SALT_ZEROMQ_REQS))
|
|
||||||
elif self.distribution.salt_transport == 'raet':
|
|
||||||
self.distribution.install_requires.extend(_parse_requirements_file(SALT_RAET_REQS))
|
|
||||||
return check.run(self)
|
|
||||||
# <---- Custom Distutils/Setuptools Commands -------------------------------------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
class SaltDistribution(BaseDistribution):
|
|
||||||
|
|
||||||
global_options = BaseDistribution.global_options + [
|
|
||||||
('salt-transport=', None,
|
|
||||||
'The transport to prepare salt for. Choices are \'zeromq\' '
|
|
||||||
'and \'raet\'. Defaults to \'zeromq\''),
|
|
||||||
]
|
|
||||||
|
|
||||||
def __init__(self, attrs=None):
|
|
||||||
BaseDistribution.__init__(self, attrs=attrs)
|
|
||||||
|
|
||||||
# At this point options haven't been parsed yet. Provide defaults
|
|
||||||
self.salt_transport = 'zeromq'
|
|
||||||
|
|
||||||
# This flag is required to tweak the salt paths at install time
|
|
||||||
self.running_salt_install = False
|
|
||||||
|
|
||||||
self.cmdclass['check'] = Check
|
|
||||||
self.cmdclass['test'] = TestCommand
|
|
||||||
self.cmdclass['clean'] = Clean
|
|
||||||
self.cmdclass['build'] = Build
|
|
||||||
self.cmdclass['install'] = Install
|
|
||||||
if IS_WINDOWS_PLATFORM is False:
|
|
||||||
self.cmdclass['sdist'] = CloudSdist
|
|
||||||
self.cmdclass['install_lib'] = InstallLib
|
|
||||||
|
|
||||||
self.setup_requires = ['requests']
|
|
||||||
self.install_requires = _parse_requirements_file(SALT_REQS)
|
|
||||||
|
|
||||||
if IS_WINDOWS_PLATFORM is False:
|
|
||||||
# self.packages.extend(['salt.cloud',
|
|
||||||
# 'salt.cloud.clouds'])
|
|
||||||
self.package_data['salt.cloud'] = ['deploy/*.sh']
|
|
||||||
|
|
||||||
self.data_files[0][1].extend([
|
|
||||||
'doc/man/salt-master.1',
|
|
||||||
'doc/man/salt-key.1',
|
|
||||||
'doc/man/salt.1',
|
|
||||||
'doc/man/salt-syndic.1',
|
|
||||||
'doc/man/salt-run.1',
|
|
||||||
'doc/man/salt-ssh.1',
|
|
||||||
'doc/man/salt-cloud.1'
|
|
||||||
])
|
|
||||||
else:
|
|
||||||
self.install_requires.append('WMI')
|
|
||||||
|
|
||||||
if WITH_SETUPTOOLS:
|
|
||||||
self.entry_points = {
|
|
||||||
'console_scripts': ['salt-call = salt.scripts:salt_call',
|
|
||||||
'salt-cp = salt.scripts:salt_cp',
|
|
||||||
'salt-minion = salt.scripts:salt_minion',
|
|
||||||
]
|
|
||||||
}
|
|
||||||
if IS_WINDOWS_PLATFORM is False:
|
|
||||||
self.entry_points['console_scripts'].extend([
|
|
||||||
'salt = salt.scripts:salt_main',
|
|
||||||
'salt-cloud = salt.scripts:salt_cloud',
|
|
||||||
'salt-key = salt.scripts:salt_key',
|
|
||||||
'salt-master = salt.scripts:salt_master',
|
|
||||||
'salt-run = salt.scripts:salt_run',
|
|
||||||
'salt-ssh = salt.scripts:salt_ssh',
|
|
||||||
'salt-syndic = salt.scripts:salt_syndic',
|
|
||||||
])
|
|
||||||
|
|
||||||
# Required for running the tests suite
|
|
||||||
self.dependency_links = [
|
|
||||||
'https://github.com/saltstack/salt-testing/tarball/develop#egg=SaltTesting'
|
|
||||||
]
|
|
||||||
self.tests_require = ['SaltTesting']
|
|
||||||
else:
|
|
||||||
self.scripts = [
|
|
||||||
'scripts/salt-call',
|
|
||||||
'scripts/salt-cp',
|
|
||||||
'scripts/salt-minion',
|
|
||||||
'scripts/salt-unity',
|
|
||||||
]
|
|
||||||
|
|
||||||
if IS_WINDOWS_PLATFORM is False:
|
|
||||||
self.scripts.extend([
|
|
||||||
'scripts/salt',
|
|
||||||
'scripts/salt-cloud',
|
|
||||||
'scripts/salt-key',
|
|
||||||
'scripts/salt-master',
|
|
||||||
'scripts/salt-run',
|
|
||||||
'scripts/salt-ssh',
|
|
||||||
'scripts/salt-syndic',
|
|
||||||
])
|
|
||||||
|
|
||||||
|
|
||||||
NAME = 'salt'
|
NAME = 'salt'
|
||||||
VER = __version__ # pylint: disable=E0602
|
VER = __version__ # pylint: disable=E0602
|
||||||
DESC = 'Portable, distributed, remote execution and configuration management system'
|
DESC = ('Portable, distributed, remote execution and '
|
||||||
|
'configuration management system')
|
||||||
|
|
||||||
SETUP_KWARGS = {'distclass': SaltDistribution,
|
REQUIREMENTS = []
|
||||||
'name': NAME,
|
with open(SALT_REQS) as rfh:
|
||||||
|
for line in rfh.readlines():
|
||||||
|
if not line or line.startswith('#'):
|
||||||
|
continue
|
||||||
|
if IS_WINDOWS_PLATFORM and 'libcloud' in line:
|
||||||
|
continue
|
||||||
|
REQUIREMENTS.append(line.strip())
|
||||||
|
|
||||||
|
SETUP_KWARGS = {'name': NAME,
|
||||||
'version': VER,
|
'version': VER,
|
||||||
'description': DESC,
|
'description': DESC,
|
||||||
'author': 'Thomas S Hatch',
|
'author': 'Thomas S Hatch',
|
||||||
'author_email': 'thatch45@gmail.com',
|
'author_email': 'thatch45@gmail.com',
|
||||||
'url': 'http://saltstack.org',
|
'url': 'http://saltstack.org',
|
||||||
'license': 'Apache Software License, Version 2.0',
|
'cmdclass': {
|
||||||
|
'test': TestCommand,
|
||||||
|
'clean': Clean,
|
||||||
|
'build': Build,
|
||||||
|
'install': Install
|
||||||
|
},
|
||||||
'classifiers': ['Programming Language :: Python',
|
'classifiers': ['Programming Language :: Python',
|
||||||
'Programming Language :: Cython',
|
'Programming Language :: Cython',
|
||||||
'Programming Language :: Python :: 2.6',
|
'Programming Language :: Python :: 2.6',
|
||||||
|
|
@ -609,11 +516,29 @@ SETUP_KWARGS = {'distclass': SaltDistribution,
|
||||||
['doc/man/salt.7',
|
['doc/man/salt.7',
|
||||||
]),
|
]),
|
||||||
],
|
],
|
||||||
|
# Required for esky builds
|
||||||
|
'install_requires': REQUIREMENTS,
|
||||||
# The dynamic module loading in salt.modules makes this
|
# The dynamic module loading in salt.modules makes this
|
||||||
# package zip unsafe. Required for esky builds
|
# package zip unsafe. Required for esky builds
|
||||||
'zip_safe': False
|
'zip_safe': False
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if IS_WINDOWS_PLATFORM is False:
|
||||||
|
SETUP_KWARGS['cmdclass']['sdist'] = CloudSdist
|
||||||
|
SETUP_KWARGS['cmdclass']['install_lib'] = InstallLib
|
||||||
|
#SETUP_KWARGS['packages'].extend(['salt.cloud',
|
||||||
|
# 'salt.cloud.clouds'])
|
||||||
|
SETUP_KWARGS['package_data']['salt.cloud'] = ['deploy/*.sh']
|
||||||
|
SETUP_KWARGS['data_files'][0][1].extend([
|
||||||
|
'doc/man/salt-master.1',
|
||||||
|
'doc/man/salt-key.1',
|
||||||
|
'doc/man/salt.1',
|
||||||
|
'doc/man/salt-syndic.1',
|
||||||
|
'doc/man/salt-run.1',
|
||||||
|
'doc/man/salt-ssh.1',
|
||||||
|
'doc/man/salt-cloud.1'
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
# bbfreeze explicit includes
|
# bbfreeze explicit includes
|
||||||
# Sometimes the auto module traversal doesn't find everything, so we
|
# Sometimes the auto module traversal doesn't find everything, so we
|
||||||
|
|
@ -666,6 +591,7 @@ if IS_WINDOWS_PLATFORM:
|
||||||
'site',
|
'site',
|
||||||
'psutil',
|
'psutil',
|
||||||
])
|
])
|
||||||
|
SETUP_KWARGS['install_requires'].append('WMI')
|
||||||
elif sys.platform.startswith('linux'):
|
elif sys.platform.startswith('linux'):
|
||||||
FREEZER_INCLUDES.append('spwd')
|
FREEZER_INCLUDES.append('spwd')
|
||||||
try:
|
try:
|
||||||
|
|
@ -700,6 +626,46 @@ if HAS_ESKY:
|
||||||
}
|
}
|
||||||
SETUP_KWARGS['options'] = OPTIONS
|
SETUP_KWARGS['options'] = OPTIONS
|
||||||
|
|
||||||
|
if WITH_SETUPTOOLS:
|
||||||
|
SETUP_KWARGS['entry_points'] = {
|
||||||
|
'console_scripts': ['salt-call = salt.scripts:salt_call',
|
||||||
|
'salt-cp = salt.scripts:salt_cp',
|
||||||
|
'salt-minion = salt.scripts:salt_minion',
|
||||||
|
]
|
||||||
|
}
|
||||||
|
if IS_WINDOWS_PLATFORM is False:
|
||||||
|
SETUP_KWARGS['entry_points']['console_scripts'].extend([
|
||||||
|
'salt = salt.scripts:salt_main',
|
||||||
|
'salt-cloud = salt.scripts:salt_cloud',
|
||||||
|
'salt-key = salt.scripts:salt_key',
|
||||||
|
'salt-master = salt.scripts:salt_master',
|
||||||
|
'salt-run = salt.scripts:salt_run',
|
||||||
|
'salt-ssh = salt.scripts:salt_ssh',
|
||||||
|
'salt-syndic = salt.scripts:salt_syndic',
|
||||||
|
])
|
||||||
|
|
||||||
|
# Required for running the tests suite
|
||||||
|
SETUP_KWARGS['dependency_links'] = [
|
||||||
|
'https://github.com/saltstack/salt-testing/tarball/develop#egg=SaltTesting'
|
||||||
|
]
|
||||||
|
SETUP_KWARGS['tests_require'] = ['SaltTesting']
|
||||||
|
else:
|
||||||
|
SETUP_KWARGS['scripts'] = ['scripts/salt-call',
|
||||||
|
'scripts/salt-cp',
|
||||||
|
'scripts/salt-minion',
|
||||||
|
'scripts/salt-unity',
|
||||||
|
]
|
||||||
|
|
||||||
|
if IS_WINDOWS_PLATFORM is False:
|
||||||
|
SETUP_KWARGS['scripts'].extend([
|
||||||
|
'scripts/salt',
|
||||||
|
'scripts/salt-cloud',
|
||||||
|
'scripts/salt-key',
|
||||||
|
'scripts/salt-master',
|
||||||
|
'scripts/salt-run',
|
||||||
|
'scripts/salt-ssh',
|
||||||
|
'scripts/salt-syndic',
|
||||||
|
])
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
setup(**SETUP_KWARGS)
|
setup(**SETUP_KWARGS)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue