From f809a453fb9d3364cf9a8024b18033cb8c26aa78 Mon Sep 17 00:00:00 2001 From: Raul Cuza Date: Sat, 24 Dec 2011 00:43:56 -0500 Subject: Add dist directory to ignore list. Anything in this directory can easily be recreated from the code. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 30c1091da..9fef5a333 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ build/ +dist/ src/Bcfg2 *.pyc -- cgit v1.2.3-1-g7c22 From b1fdf77eb0b6ad0566eeaaf1e9984e7594169a80 Mon Sep 17 00:00:00 2001 From: Raul Cuza Date: Sat, 24 Dec 2011 01:02:39 -0500 Subject: Bumped version to 1.2.1 alpha 1. All work post v1.2.0 tag needs to be versioned greater than v1.2.0. Following PEP 386. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 410dc55a6..34ba59e02 100755 --- a/setup.py +++ b/setup.py @@ -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", -- cgit v1.2.3-1-g7c22 From c82f2afef30599b3e4135044531f7b20ca281948 Mon Sep 17 00:00:00 2001 From: Raul Cuza Date: Sat, 24 Dec 2011 01:16:59 -0500 Subject: Add two more requirements. --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 34ba59e02..115a2f6f6 100755 --- a/setup.py +++ b/setup.py @@ -140,7 +140,9 @@ setup(cmdclass=cmdclass, "Bcfg2.Server.Reports.reports.templatetags", "Bcfg2.Server.Snapshots", ], - install_requires = ["lxml"], + install_requires = ["lxml", + "M2Crypto"], + "ssl"], package_dir = {'Bcfg2': 'src/lib'}, package_data = {'Bcfg2.Server.Reports.reports':['fixtures/*.xml', 'templates/*.html', 'templates/*/*.html', -- cgit v1.2.3-1-g7c22 From b1336674e1034372fe3e51f273bc568dd79d1c59 Mon Sep 17 00:00:00 2001 From: Raul Cuza Date: Sat, 24 Dec 2011 01:19:29 -0500 Subject: Correct bracket in install_requires. --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 115a2f6f6..075534020 100755 --- a/setup.py +++ b/setup.py @@ -141,8 +141,9 @@ setup(cmdclass=cmdclass, "Bcfg2.Server.Snapshots", ], install_requires = ["lxml", - "M2Crypto"], - "ssl"], + "M2Crypto", + "ssl", + ], package_dir = {'Bcfg2': 'src/lib'}, package_data = {'Bcfg2.Server.Reports.reports':['fixtures/*.xml', 'templates/*.html', 'templates/*/*.html', -- cgit v1.2.3-1-g7c22 From 10de4c4d067ccc982b75301e5af599fbf95456be Mon Sep 17 00:00:00 2001 From: Raul Cuza Date: Sat, 24 Dec 2011 01:22:02 -0500 Subject: Remove ssl as a requirement. Need a more sophisticated way to handle earlier python versions needs for ssl and other extension built into later python versions. --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 075534020..0f51ed4c5 100755 --- a/setup.py +++ b/setup.py @@ -142,7 +142,6 @@ setup(cmdclass=cmdclass, ], install_requires = ["lxml", "M2Crypto", - "ssl", ], package_dir = {'Bcfg2': 'src/lib'}, package_data = {'Bcfg2.Server.Reports.reports':['fixtures/*.xml', -- cgit v1.2.3-1-g7c22