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

PEP8 for packaging

Browse source
This commit is contained in:
Intchanter 2012-06-30 14:35:31 -06:00
parent a1433ef5ec
commit 66b2e4988c
2 changed files with 61 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkg/freeze/freeze.py
View file

@ -10,4 +10,3 @@ fre.addScript('/usr/bin/salt-minion')
fre.use_compression = 0 fre.use_compression = 0
fre.include_py = True fre.include_py = True
fre() fre()

114
setup.py
View file

@ -21,14 +21,19 @@ except ImportError:
from distutils.core import setup from distutils.core import setup
with_setuptools = False with_setuptools = False
exec(compile(open("salt/version.py").read(), "salt/version.py", 'exec')) exec(compile(open("salt/version.py").read(), "salt/version.py", 'exec'))
class TestCommand(Command): class TestCommand(Command):
description = 'Run tests' description = 'Run tests'
user_options = [] user_options = []
def initialize_options(self): pass
def finalize_options(self): pass def initialize_options(self):
pass
def finalize_options(self):
pass
def run(self): def run(self):
from subprocess import Popen from subprocess import Popen
self.run_command('build') self.run_command('build')
@ -60,60 +65,63 @@ else:
libraries = ['ws2_32'] if sys.platform == 'win32' else [] libraries = ['ws2_32'] if sys.platform == 'win32' else []
requirements='' requirements = ''
with open('requirements.txt') as f: with open('requirements.txt') as f:
requirements = f.read() requirements = f.read()
setup_kwargs = {'name': NAME, setup_kwargs = {
'version': VER, 'name': NAME,
'description': DESC, 'version': VER,
'author': 'Thomas S Hatch', 'description': DESC,
'author_email': 'thatch45@gmail.com', 'author': 'Thomas S Hatch',
'url': 'http://saltstack.org', 'author_email': 'thatch45@gmail.com',
'cmdclass': {'test': TestCommand}, 'url': 'http://saltstack.org',
'classifiers': ['Programming Language :: Python', 'cmdclass': {'test': TestCommand},
'Programming Language :: Cython', 'classifiers': [
'Programming Language :: Python :: 2.6', 'Programming Language :: Python',
'Programming Language :: Python :: 2.7', 'Programming Language :: Cython',
'Development Status :: 5 - Production/Stable', 'Programming Language :: Python :: 2.6',
'Environment :: Console', 'Programming Language :: Python :: 2.7',
'Intended Audience :: Developers', 'Development Status :: 5 - Production/Stable',
'Intended Audience :: Information Technology', 'Environment :: Console',
'Intended Audience :: System Administrators', 'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License', 'Intended Audience :: Information Technology',
'Operating System :: POSIX :: Linux', 'Intended Audience :: System Administrators',
'Topic :: System :: Clustering', 'License :: OSI Approved :: Apache Software License',
'Topic :: System :: Distributed Computing', 'Operating System :: POSIX :: Linux',
], 'Topic :: System :: Clustering',
'packages': ['salt', 'Topic :: System :: Distributed Computing',
'salt.cli', ],
'salt.ext', 'packages': [
'salt.grains', 'salt',
'salt.modules', 'salt.cli',
'salt.renderers', 'salt.ext',
'salt.returners', 'salt.grains',
'salt.runners', 'salt.modules',
'salt.states', 'salt.renderers',
'salt.utils', 'salt.returners',
], 'salt.runners',
'package_data': { 'salt.states',
'salt.modules': ['rh_ip/*.jinja'], 'salt.utils',
}, ],
'data_files': [('share/man/man1', 'package_data': {
['doc/man/salt-master.1', 'salt.modules': ['rh_ip/*.jinja'],
'doc/man/salt-key.1', },
'doc/man/salt.1', 'data_files': [('share/man/man1',
'doc/man/salt-cp.1', ['doc/man/salt-master.1',
'doc/man/salt-call.1', 'doc/man/salt-key.1',
'doc/man/salt-syndic.1', 'doc/man/salt.1',
'doc/man/salt-run.1', 'doc/man/salt-cp.1',
'doc/man/salt-minion.1', 'doc/man/salt-call.1',
]), 'doc/man/salt-syndic.1',
('share/man/man7', ['doc/man/salt.7']), 'doc/man/salt-run.1',
], 'doc/man/salt-minion.1',
'install_requires': requirements, ]),
} ('share/man/man7', ['doc/man/salt.7']),
],
'install_requires': requirements,
}
if with_setuptools: if with_setuptools:
setup_kwargs['entry_points'] = { setup_kwargs['entry_points'] = {