Charm Helpers

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

  1. include-sub-packages
  2. Merge into devel
Proposed by Michael Nelson
Status: Merged
Approved by: Matthew Wedgwood
Approved revision: 14
Merge reported by: Matthew Wedgwood
Merged at revision: not available
Proposed branch: lp:~michael.nelson/charm-helpers/include-sub-packages
Merge into: lp:charm-helpers
Diff against target: 60 lines (+27/-2)
3 files modified
Makefile (+2/-1)
setup.py (+7/-1)
test_requirements.txt (+18/-0)
To merge this branch: bzr merge lp:~michael.nelson/charm-helpers/include-sub-packages
Reviewer Review Type Date Requested Status
Matthew Wedgwood (community) Approve
Review via email: mp+165028@code.launchpad.net

Commit message

Include contrib subpackages in setup.py

Description of the change

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/

To post a comment you must log in.
Revision history for this message
Matthew Wedgwood (mew) wrote :

Thanks michael!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2013-05-11 20:24:29 +0000
3+++ Makefile 2013-05-22 08:14:30 +0000
4@@ -1,4 +1,5 @@
5 PROJECT=charmhelpers
6+PYTHON := /usr/bin/env python
7 SUITE=unstable
8 TESTS=tests/
9
10@@ -32,7 +33,7 @@
11
12 test:
13 @echo Starting tests...
14- @nosetests --nologcapture tests/
15+ @$(PYTHON) /usr/bin/nosetests --nologcapture tests/
16
17 lint:
18 @echo Checking for Python syntax...
19
20=== modified file 'setup.py'
21--- setup.py 2013-05-11 20:24:29 +0000
22+++ setup.py 2013-05-22 08:14:30 +0000
23@@ -14,7 +14,13 @@
24 'author': "Ubuntu Developers",
25 'author_email': "ubuntu-devel-discuss@lists.ubuntu.com",
26 'url': "https://code.launchpad.net/charm-helpers",
27- 'packages': ["charmhelpers"],
28+ 'packages': [
29+ "charmhelpers",
30+ "charmhelpers.contrib.charmhelpers",
31+ "charmhelpers.contrib.charmsupport",
32+ "charmhelpers.contrib.hahelpers",
33+ "charmhelpers.contrib.jujugui",
34+ ],
35 'scripts': ["bin/contrib/charmsupport/charmsupport"],
36 'license': "Affero GNU Public License v3",
37 'long_description': open('README.txt').read(),
38
39=== added file 'test_requirements.txt'
40--- test_requirements.txt 1970-01-01 00:00:00 +0000
41+++ test_requirements.txt 2013-05-22 08:14:30 +0000
42@@ -0,0 +1,18 @@
43+# If you don't have the required packages on your system and prefer
44+# to keep your system clean, you can do the following to run the
45+# charm-helper test suite:
46+# $ virtualenv .env
47+# $ . .env/bin/activate
48+# $ pip install -r test_requirements.txt
49+# Then `make test` should find all its dependencies.
50+coverage==3.6
51+launchpadlib==1.10.2
52+mock==1.0.1
53+nose==1.1.2
54+PyYAML==3.10
55+# Note: This is compiled and will require libapt-pkg-dev for headers.
56+python-apt
57+simplejson==3.3.0
58+testtools==0.9.31
59+Tempita==0.5.1
60+bzr+http://bazaar.launchpad.net/~yellow/python-shelltoolbox/trunk@17#egg=shelltoolbox

Subscribers

People subscribed via source and target branches