Merge lp://staging/~dobey/ubuntuone-client/py-fixes into lp://staging/ubuntuone-client

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 1398
Merged at revision: 1398
Proposed branch: lp://staging/~dobey/ubuntuone-client/py-fixes
Merge into: lp://staging/ubuntuone-client
Diff against target: 85 lines (+19/-9)
4 files modified
run-tests (+1/-1)
run-tests.bat (+1/-1)
setup.py (+16/-7)
ubuntuone-client.pth (+1/-0)
To merge this branch: bzr merge lp://staging/~dobey/ubuntuone-client/py-fixes
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+168535@code.staging.launchpad.net

Commit message

Move the reactor import check script to contrib, as a script.
Update the run-tests scripts for the change.
Add a .pth file.
Work around DistUtilsExtra.auto wanting to install everything with __init__.py.

Description of the change

This should hopefully fix the weird error occurring when the reactor import checker is run in the daily builds. The check works fine locally, and I don't see anything else that might cause it. So adding the .pth here, moving the script, and avoiding install of the contrib and tests directories as packages, should hopefully fix it.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) wrote :

works on osx for me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches