Merge lp:~michael.nelson/charm-helpers/include-sub-packages into lp:charm-helpers

[Michael Nelson]

Include contrib subpackages in setup.py

Include contrib subpackages in setup.py

I noticed while trying to install charmhelpers locally that it wouldn't include the contrib packages [1]. AFAICT, it's simply that they were missing from the setup.py.

Feel free to just take the diff of setup.py (assuming it's OK). The rest of the changes were just to enable me to use `make test` without installing a bunch of packages system-wide (there might be a better way to do this... my setup.py-fu isn't strong).

Also, I was going to file a bug instead, but bug tracking wasn't enabled for charm-helpers.

Thanks!

[1] https://pastebin.canonical.com/91421/

[Matthew Wedgwood (mew)]

Thanks michael!

review: Approve

=== modified file 'Makefile'
--- Makefile	2013-05-11 20:24:29 +0000
+++ Makefile	2013-05-22 08:14:30 +0000
@@ -1,4 +1,5 @@
 PROJECT=charmhelpers
+PYTHON := /usr/bin/env python
 SUITE=unstable
 TESTS=tests/
 
@@ -32,7 +33,7 @@
 
 test:
 	@echo Starting tests...
-	@nosetests --nologcapture tests/
+	@$(PYTHON) /usr/bin/nosetests --nologcapture tests/
 
 lint:
 	@echo Checking for Python syntax...
 
=== modified file 'setup.py'
--- setup.py	2013-05-11 20:24:29 +0000
+++ setup.py	2013-05-22 08:14:30 +0000
@@ -14,7 +14,13 @@
     'author': "Ubuntu Developers",
     'author_email': "[e-mail]",
     'url': "https://code.launchpad.net/charm-helpers",
-    'packages': ["charmhelpers"],
+    'packages': [
+        "charmhelpers",
+        "charmhelpers.contrib.charmhelpers",
+        "charmhelpers.contrib.charmsupport",
+        "charmhelpers.contrib.hahelpers",
+        "charmhelpers.contrib.jujugui",
+    ],
     'scripts': ["bin/contrib/charmsupport/charmsupport"],
     'license': "Affero GNU Public License v3",
     'long_description': open('README.txt').read(),
 
=== added file 'test_requirements.txt'
--- test_requirements.txt	1970-01-01 00:00:00 +0000
+++ test_requirements.txt	2013-05-22 08:14:30 +0000
@@ -0,0 +1,18 @@
+# If you don't have the required packages on your system and prefer
+# to keep your system clean, you can do the following to run the
+# charm-helper test suite:
+# $ virtualenv .env
+# $ . .env/bin/activate
+# $ pip install -r test_requirements.txt
+# Then `make test` should find all its dependencies.
+coverage==3.6
+launchpadlib==1.10.2
+mock==1.0.1
+nose==1.1.2
+PyYAML==3.10
+# Note: This is compiled and will require libapt-pkg-dev for headers.
+python-apt
+simplejson==3.3.0
+testtools==0.9.31
+Tempita==0.5.1
+bzr+http://bazaar.launchpad.net/~yellow/python-shelltoolbox/trunk@17#egg=shelltoolbox