diff options
| -rwxr-xr-x | setup.py | 28 | ||||
| -rwxr-xr-x | tools/export.py | 3 |
2 files changed, 14 insertions, 17 deletions
@@ -4,26 +4,26 @@ 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 = [ + '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 +55,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')), diff --git a/tools/export.py b/tools/export.py index 716c831d9..0f4724e6b 100755 --- a/tools/export.py +++ b/tools/export.py @@ -227,9 +227,6 @@ E.G. 1.2.0pre1 is a valid version. 'VERSION="%s"\n' % version, startswith=True, dryrun=options.dryrun) - # set new version in setup.py - find_and_replace('setup.py', 'version=', ' version="%s",\n' % version, - dryrun=options.dryrun) # set new version in Bcfg2/version.py find_and_replace('src/lib/Bcfg2/version.py', '__version__ =', |