Merge lp://qastaging/~michael.nelson/charm-helpers/include-sub-packages into lp://qastaging/charm-helpers
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://qastaging/~michael.nelson/charm-helpers/include-sub-packages |
| Merge into: | lp://qastaging/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://qastaging/~michael.nelson/charm-helpers/include-sub-packages |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Matthew Wedgwood (community) | Approve | ||
|
Review via email:
|
|||
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!
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks michael!