diff options
author | Raul Cuza <raulcuza@gmail.com> | 2011-12-23 23:05:30 -0800 |
---|---|---|
committer | Raul Cuza <raulcuza@gmail.com> | 2011-12-23 23:05:30 -0800 |
commit | 287bdcdb736a0ab949bb8ab8b809dba78d708b82 (patch) | |
tree | 84c4c94f84ab3c879f1ad71617aa7b4f26b2e818 | |
parent | 49b1adfa957647a2d39d069f45f6a8110c325d60 (diff) | |
parent | 10de4c4d067ccc982b75301e5af599fbf95456be (diff) | |
download | bcfg2-287bdcdb736a0ab949bb8ab8b809dba78d708b82.tar.gz bcfg2-287bdcdb736a0ab949bb8ab8b809dba78d708b82.tar.bz2 bcfg2-287bdcdb736a0ab949bb8ab8b809dba78d708b82.zip |
Merge pull request #7 from rcuza/master
Bumped the Version and Ignoring a new directory
-rw-r--r-- | .gitignore | 1 | ||||
-rwxr-xr-x | setup.py | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 30c1091da..9fef5a333 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ build/ +dist/ src/Bcfg2 *.pyc @@ -121,7 +121,7 @@ if sys.hexversion < 0x03000000 and os.path.exists(py3lib): setup(cmdclass=cmdclass, name="Bcfg2", - version="1.2.0", + version="1.2.1a1", description="Bcfg2 Server", author="Narayan Desai", author_email="desai@mcs.anl.gov", @@ -140,7 +140,9 @@ setup(cmdclass=cmdclass, "Bcfg2.Server.Reports.reports.templatetags", "Bcfg2.Server.Snapshots", ], - install_requires = ["lxml"], + install_requires = ["lxml", + "M2Crypto", + ], package_dir = {'Bcfg2': 'src/lib'}, package_data = {'Bcfg2.Server.Reports.reports':['fixtures/*.xml', 'templates/*.html', 'templates/*/*.html', |