valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24755 from rallytime/fix_setup_15

Browse Source 
Remove SALT_CLOUD_REQS from setup.py
This commit is contained in:
Justin Findlay 2015-06-17 11:42:25 -06:00
commit bf2dd94389
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup.py
View File

@ -105,7 +105,6 @@ SALT_VERSION = os.path.join(os.path.abspath(SETUP_DIRNAME), 'salt', 'version.py'
SALT_VERSION_HARDCODED = os.path.join(os.path.abspath(SETUP_DIRNAME), 'salt', '_version.py') SALT_VERSION_HARDCODED = os.path.join(os.path.abspath(SETUP_DIRNAME), 'salt', '_version.py')
SALT_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), '_requirements.txt') SALT_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), '_requirements.txt')
SALT_ZEROMQ_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'zeromq-requirements.txt') SALT_ZEROMQ_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'zeromq-requirements.txt')
SALT_CLOUD_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'cloud-requirements.txt')
SALT_RAET_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'raet-requirements.txt') SALT_RAET_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'raet-requirements.txt')
# Salt SSH Packaging Detection # Salt SSH Packaging Detection
@ -738,8 +737,7 @@ class SaltDistribution(distutils.dist.Distribution):
def _property_extras_require(self): def _property_extras_require(self):
if self.ssh_packaging: if self.ssh_packaging:
return {} return {}
return {'RAET': _parse_requirements_file(SALT_RAET_REQS), return {'RAET': _parse_requirements_file(SALT_RAET_REQS)}
'Cloud': _parse_requirements_file(SALT_CLOUD_REQS)}
@property @property
def _property_scripts(self): def _property_scripts(self):