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

The tests require setup settings can only be addded if setuptools is in use.

Browse source
This commit is contained in:
Pedro Algarvio 2013-06-26 21:21:58 +01:00
parent 6456934cba
commit e7c07c8e55
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
setup.py
View file

@ -233,11 +233,6 @@ setup_kwargs = {'name': NAME,
],
# Required for esky builds
'install_requires': requirements,
# Required for running the tests suite
'dependency_links': [
'https://github.com/saltstack/salt-testing/tarball/develop#egg=SaltTesting'
],
'tests_require': ['SaltTesting'],
# The dynamic module loading in salt.modules makes this
# package zip unsafe. Required for esky builds
'zip_safe': False
@ -304,6 +299,12 @@ if with_setuptools:
'salt = salt.scripts:salt_main'
],
}
# 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-master',
'scripts/salt-minion',