saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Minor PEP-8. Remove non supported distutils options from setup_kwargs if not using setuptools.

Browse source
This commit is contained in:
Pedro Algarvio 2012-11-26 03:06:25 +00:00
parent 65d5e6dcc9
commit e70d70aa75
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
setup.py
View file

@ -202,10 +202,10 @@ if 'bdist_esky' in sys.argv:
import bbfreeze
options = setup_kwargs.get('options', {})
options['bdist_esky'] = {
"freezer_module": "bbfreeze",
"freezer_options": {
"includes": freezer_includes
}
"freezer_module": "bbfreeze",
"freezer_options": {
"includes": freezer_includes
}
}
setup_kwargs['options'] = options
@ -230,6 +230,10 @@ else:
'scripts/salt-call',
'scripts/salt-run',
'scripts/salt']
# Distutils does not know what these are and throws warnings.
# Stop the warning.
setup_kwargs.pop('install_requires')
setup_kwargs.pop('zip_safe')
if __name__ == '__main__':
setup(**setup_kwargs)