Permalink
Browse files

Clean up requires in setup.py; gitignores.

  • Loading branch information...
1 parent 4a53206 commit 0b799144c563e34135e8de5bb56ebacd61fa7638 @labisso labisso committed Oct 30, 2012
Showing with 32 additions and 12 deletions.
  1. +3 −1 .gitignore
  2. +9 −1 TESTING.txt
  3. +20 −10 setup.py
View
@@ -1,4 +1,6 @@
+dist/
+build/
+*.egg-info
*.pyc
*.pyo
-cloudboot.egg-info
/docs/plans/common/cookbooks.tar.gz
View
@@ -4,7 +4,15 @@ Testing cloudinit.d
Simple Testing on Local System
------------------------------
-Setup cloudinit.d with "python setup.py install" then run:
+Setup cloudinit.d with:
+
+ python setup.py develop
+
+Then use pip to install additional testing dependencies:
+
+ pip install cloudinit[test]
+
+Finally, run basic tests with:
nosetests cloudinitd
View
@@ -29,6 +29,21 @@ def plans_list_dirs(p):
basepath = os.path.dirname(__file__)
test_plans = plans_list_dirs(os.path.join(basepath, "tests/plans"))
+install_requires = [
+ "boto >= 2.6",
+ "sqlalchemy >= 0.7.6",
+ "fabric == 1.3",
+ "simplejson >= 2.1",
+ "apache-libcloud == 0.11.1",
+ "uuid",
+ "PyCrypto >=2.1, <2.4"
+ ]
+
+tests_require = install_requires + [
+ 'mock',
+ 'nose',
+ ]
+
setup(name='cloudinitd',
version=Version,
description='An Open Source bootstrap tool for services in the cloud.',
@@ -56,16 +71,11 @@ def plans_list_dirs(p):
booted and ready to go, booting begins on level 2.
""",
license="Apache2",
- install_requires = [
- "boto >= 2.6",
- "sqlalchemy >= 0.7.6",
- "fabric == 1.3",
- "simplejson >= 2.1",
- "apache-libcloud == 0.11.1",
- "uuid",
- "PyCrypto >=2.1, <2.4"
- ],
-
+ install_requires = install_requires,
+ tests_require=tests_require,
+ extras_require={
+ 'test': tests_require,
+ },
classifiers=[
'Development Status :: 4 - Beta',
'Environment :: Console',

0 comments on commit 0b79914

Please sign in to comment.