"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "setup.py" between
salt-2019.2.0.tar.gz and salt-2019.2.1.tar.gz

About: SaltStack is a systems management software for data center automation, cloud orchestration, server provisioning, configuration management and more. Community version.

setup.py  (salt-2019.2.0):setup.py  (salt-2019.2.1)
skipping to change at line 203 skipping to change at line 203
True True
>>> _check_ver('2.7.15', 'gt', '2.7.15') >>> _check_ver('2.7.15', 'gt', '2.7.15')
False False
>>> _check_ver('2.7.15', 'ge', '2.7.15') >>> _check_ver('2.7.15', 'ge', '2.7.15')
True True
>>> _check_ver('2.7.15', 'eq', '2.7.15') >>> _check_ver('2.7.15', 'eq', '2.7.15')
True True
''' '''
pyver = distutils.version.LooseVersion(pyver) pyver = distutils.version.LooseVersion(pyver)
wanted = distutils.version.LooseVersion(wanted) wanted = distutils.version.LooseVersion(wanted)
if IS_PY3:
if not isinstance(pyver, str):
pyver = str(pyver)
if not isinstance(wanted, str):
wanted = str(wanted)
return getattr(operator, '__{}__'.format(op))(pyver, wanted) return getattr(operator, '__{}__'.format(op))(pyver, wanted)
def _parse_requirements_file(requirements_file): def _parse_requirements_file(requirements_file):
parsed_requirements = [] parsed_requirements = []
with open(requirements_file) as rfh: with open(requirements_file) as rfh:
for line in rfh.readlines(): for line in rfh.readlines():
line = line.strip() line = line.strip()
if not line or line.startswith(('#', '-r')): if not line or line.startswith(('#', '-r')):
continue continue
if IS_WINDOWS_PLATFORM: if IS_WINDOWS_PLATFORM:
skipping to change at line 754 skipping to change at line 759
# setup.py or the special .salt-ssh-package is found # setup.py or the special .salt-ssh-package is found
class SaltDistribution(distutils.dist.Distribution): class SaltDistribution(distutils.dist.Distribution):
''' '''
Just so it's completely clear Just so it's completely clear
Under windows, the following scripts should be installed: Under windows, the following scripts should be installed:
* salt-call * salt-call
* salt-cp * salt-cp
* salt-minion * salt-minion
* salt-syndic
* salt-unity * salt-unity
* salt-proxy * spm
When packaged for salt-ssh, the following scripts should be installed: When packaged for salt-ssh, the following scripts should be installed:
* salt-call * salt-call
* salt-run * salt-run
* salt-ssh * salt-ssh
* salt-cloud * salt-cloud
Under windows, the following scripts should be omitted from the salt-ssh Under windows, the following scripts should be omitted from the salt-ssh
package: package:
* salt-cloud * salt-cloud
* salt-run * salt-run
Under *nix, all scripts should be installed Under *nix, all scripts should be installed
''' '''
global_options = distutils.dist.Distribution.global_options + [ global_options = distutils.dist.Distribution.global_options + [
('ssh-packaging', None, 'Run in SSH packaging mode'), ('ssh-packaging', None, 'Run in SSH packaging mode'),
('salt-transport=', None, 'The transport to prepare salt for. Choices ar e \'zeromq\' ' ('salt-transport=', None, 'The transport to prepare salt for. Choices ar e \'zeromq\' '
'\'raet\' or \'both\'. Defaults to \'zeromq\'' , 'zeromq')] + [ '\'raet\' or \'both\'. Defaults to \'zeromq\'' , 'zeromq')] + [
('with-salt-version=', None, 'Set a fixed version for Salt instead calcu lating it'), ('with-salt-version=', None, 'Set a fixed version for Salt instead calcu lating it'),
skipping to change at line 958 skipping to change at line 965
data_files[0][1].append('doc/man/salt-ssh.1') data_files[0][1].append('doc/man/salt-ssh.1')
if IS_WINDOWS_PLATFORM: if IS_WINDOWS_PLATFORM:
return data_files return data_files
data_files[0][1].append('doc/man/salt-cloud.1') data_files[0][1].append('doc/man/salt-cloud.1')
return data_files return data_files
if IS_WINDOWS_PLATFORM: if IS_WINDOWS_PLATFORM:
data_files[0][1].extend(['doc/man/salt-cp.1', data_files[0][1].extend(['doc/man/salt-cp.1',
'doc/man/salt-key.1', 'doc/man/salt-key.1',
'doc/man/salt-master.1',
'doc/man/salt-minion.1', 'doc/man/salt-minion.1',
'doc/man/salt-proxy.1', 'doc/man/salt-syndic.1',
'doc/man/salt-unity.1']) 'doc/man/salt-unity.1',
'doc/man/spm.1'])
return data_files return data_files
# *nix, so, we need all man pages # *nix, so, we need all man pages
data_files[0][1].extend(['doc/man/salt-api.1', data_files[0][1].extend(['doc/man/salt-api.1',
'doc/man/salt-cloud.1', 'doc/man/salt-cloud.1',
'doc/man/salt-cp.1', 'doc/man/salt-cp.1',
'doc/man/salt-key.1', 'doc/man/salt-key.1',
'doc/man/salt-master.1', 'doc/man/salt-master.1',
'doc/man/salt-minion.1', 'doc/man/salt-minion.1',
'doc/man/salt-proxy.1', 'doc/man/salt-proxy.1',
skipping to change at line 1010 skipping to change at line 1017
# Scripts common to all scenarios # Scripts common to all scenarios
scripts = ['scripts/salt-call', 'scripts/salt-run'] scripts = ['scripts/salt-call', 'scripts/salt-run']
if self.ssh_packaging or PACKAGED_FOR_SALT_SSH: if self.ssh_packaging or PACKAGED_FOR_SALT_SSH:
scripts.append('scripts/salt-ssh') scripts.append('scripts/salt-ssh')
if IS_WINDOWS_PLATFORM: if IS_WINDOWS_PLATFORM:
return scripts return scripts
scripts.extend(['scripts/salt-cloud', 'scripts/spm']) scripts.extend(['scripts/salt-cloud', 'scripts/spm'])
return scripts return scripts
if IS_WINDOWS_PLATFORM: if IS_WINDOWS_PLATFORM:
scripts.extend(['scripts/salt', scripts.extend(['scripts/salt-cp',
'scripts/salt-cp',
'scripts/salt-key', 'scripts/salt-key',
'scripts/salt-master',
'scripts/salt-minion', 'scripts/salt-minion',
'scripts/salt-proxy', 'scripts/salt-syndic',
'scripts/salt-unity']) 'scripts/salt-unity',
'scripts/spm'])
return scripts return scripts
# *nix, so, we need all scripts # *nix, so, we need all scripts
scripts.extend(['scripts/salt', scripts.extend(['scripts/salt',
'scripts/salt-api', 'scripts/salt-api',
'scripts/salt-cloud', 'scripts/salt-cloud',
'scripts/salt-cp', 'scripts/salt-cp',
'scripts/salt-key', 'scripts/salt-key',
'scripts/salt-master', 'scripts/salt-master',
'scripts/salt-minion', 'scripts/salt-minion',
'scripts/salt-proxy',
'scripts/salt-ssh', 'scripts/salt-ssh',
'scripts/salt-syndic', 'scripts/salt-syndic',
'scripts/salt-unity', 'scripts/salt-unity',
'scripts/salt-proxy',
'scripts/spm']) 'scripts/spm'])
return scripts return scripts
@property @property
def _property_entry_points(self): def _property_entry_points(self):
# console scripts common to all scenarios # console scripts common to all scenarios
scripts = ['salt-call = salt.scripts:salt_call', scripts = ['salt-call = salt.scripts:salt_call',
'salt-run = salt.scripts:salt_run'] 'salt-run = salt.scripts:salt_run']
if self.ssh_packaging or PACKAGED_FOR_SALT_SSH: if self.ssh_packaging or PACKAGED_FOR_SALT_SSH:
scripts.append('salt-ssh = salt.scripts:salt_ssh') scripts.append('salt-ssh = salt.scripts:salt_ssh')
if IS_WINDOWS_PLATFORM: if IS_WINDOWS_PLATFORM:
return {'console_scripts': scripts} return {'console_scripts': scripts}
scripts.append('salt-cloud = salt.scripts:salt_cloud') scripts.append('salt-cloud = salt.scripts:salt_cloud')
return {'console_scripts': scripts} return {'console_scripts': scripts}
if IS_WINDOWS_PLATFORM: if IS_WINDOWS_PLATFORM:
scripts.extend(['salt = salt.scripts:salt_main', scripts.extend(['salt-cp = salt.scripts:salt_cp',
'salt-cp = salt.scripts:salt_cp',
'salt-key = salt.scripts:salt_key', 'salt-key = salt.scripts:salt_key',
'salt-master = salt.scripts:salt_master',
'salt-minion = salt.scripts:salt_minion', 'salt-minion = salt.scripts:salt_minion',
'salt-syndic = salt.scripts:salt_syndic',
'salt-unity = salt.scripts:salt_unity', 'salt-unity = salt.scripts:salt_unity',
'spm = salt.scripts:salt_spm']) 'spm = salt.scripts:salt_spm'])
return {'console_scripts': scripts} return {'console_scripts': scripts}
# *nix, so, we need all scripts # *nix, so, we need all scripts
scripts.extend(['salt = salt.scripts:salt_main', scripts.extend(['salt = salt.scripts:salt_main',
'salt-api = salt.scripts:salt_api', 'salt-api = salt.scripts:salt_api',
'salt-cloud = salt.scripts:salt_cloud', 'salt-cloud = salt.scripts:salt_cloud',
'salt-cp = salt.scripts:salt_cp', 'salt-cp = salt.scripts:salt_cp',
'salt-key = salt.scripts:salt_key', 'salt-key = salt.scripts:salt_key',
 End of changes. 14 change blocks. 
15 lines changed or deleted 19 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)