Merge lp://staging/~james-w/pkgme/helpers-using-pkg-resources into lp://staging/pkgme
Proposed by
James Westby
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Jonathan Lange | ||||
| Approved revision: | 91 | ||||
| Merged at revision: | 90 | ||||
| Proposed branch: | lp://staging/~james-w/pkgme/helpers-using-pkg-resources | ||||
| Merge into: | lp://staging/pkgme | ||||
| Diff against target: |
48 lines (+10/-4) 4 files modified
MANIFEST.in (+2/-0) pkgme/backends/python/all_info (+1/-1) pkgme/backends/python/want (+1/-1) setup.py (+6/-2) |
||||
| To merge this branch: | bzr merge lp://staging/~james-w/pkgme/helpers-using-pkg-resources | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jonathan Lange | Approve | ||
|
Review via email:
|
|||
Description of the change
Hi,
I was wrong about the cause here, so the branch name is wrong.
The problem was in fact that "setup.py test" just does a build,
and the helpers weren't being copied over to the build dir, so
not available during the test.
The fix was to include them in the MANIFEST.in so that they
were included in the build. There are a few drive-by fixes
that are included to get the tests to pass in that environment.
Thanks,
James
To post a comment you must log in.
Revision history for this message
| James Westby (james-w) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Actually the last hunk isn't needed for tests to pass, it was just
a cleanup I did while trying to figure it out. I can easily drop it
if you think that the code is less readable with it.
Thanks,
James