diff options
author | Luke Cyca <me@lukecyca.com> | 2013-05-10 09:33:00 -0700 |
---|---|---|
committer | Luke Cyca <me@lukecyca.com> | 2013-05-10 09:33:00 -0700 |
commit | 9173f511d82102240b97d4e753078b0da40b8166 (patch) | |
tree | ce8091289ca78ee7bf41b724ce7c88b3d41c0fb0 /setup.py | |
parent | 4f745cc2731f7035f02566ba8bc1a0e9ae1b1a71 (diff) | |
download | bcfg2-9173f511d82102240b97d4e753078b0da40b8166.tar.gz bcfg2-9173f511d82102240b97d4e753078b0da40b8166.tar.bz2 bcfg2-9173f511d82102240b97d4e753078b0da40b8166.zip |
Cleaned up setup.py and added missing deps
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 29 |
1 files changed, 15 insertions, 14 deletions
@@ -4,26 +4,27 @@ from setuptools import setup from glob import glob import sys -vfile = 'src/lib/Bcfg2/version.py' +version_file = 'src/lib/Bcfg2/version.py' try: # python 2 - execfile(vfile) + execfile(version_file) except NameError: # py3k - exec(compile(open(vfile).read(), vfile, 'exec')) + exec(compile(open(version_file).read(), version_file, 'exec')) -# we only need m2crypto on < python2.6 -need_m2crypto = False -version = sys.version_info[:2] -if version < (2, 6): - need_m2crypto = True +inst_reqs = [ + 'genshi', + 'lockfile', + 'lxml', + 'python-daemon', +] -inst_reqs = ['lxml'] -if need_m2crypto: +# we only need m2crypto on < python2.6 +if sys.version_info[:2] < (2, 6): inst_reqs.append('M2Crypto') setup(name="Bcfg2", - version="1.3.1", + version=__version__, # Defined in src/lib/Bcfg2/version.py description="Bcfg2 Server", author="Narayan Desai", author_email="desai@mcs.anl.gov", @@ -55,9 +56,9 @@ setup(name="Bcfg2", install_requires=inst_reqs, tests_require=['mock', 'nose', 'sqlalchemy'], package_dir={'': 'src/lib', }, - package_data={'Bcfg2.Reporting': [ 'templates/*.html', - 'templates/*/*.html', - 'templates/*/*.inc']}, + package_data={'Bcfg2.Reporting': ['templates/*.html', + 'templates/*/*.html', + 'templates/*/*.inc']}, scripts=glob('src/sbin/*'), data_files=[('share/bcfg2/schemas', glob('schemas/*.xsd')), |