Ubuntu One Windows Installer

Merge lp:~mikemc/ubuntuone-windows-installer/include-all-the-oauthlib into lp:ubuntuone-windows-installer

  1. include-all-the-oauthlib
  2. Merge into trunk
Proposed by Mike McCracken
Status: Merged
Approved by: dobey
Approved revision: 166
Merged at revision: 165
Proposed branch: lp:~mikemc/ubuntuone-windows-installer/include-all-the-oauthlib
Merge into: lp:ubuntuone-windows-installer
Diff against target: 16 lines (+5/-1)
1 file modified
scripts/setup-mac.py (+5/-1)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-windows-installer/include-all-the-oauthlib
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+153255@code.launchpad.net

Commit message

- Add all used oauthlib subpackages explicitly to work around py2app not understanding them.

Description of the change

- Add all used oauthlib subpackages explicitly to work around py2app not understanding them.

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/setup-mac.py'
2--- scripts/setup-mac.py 2013-01-07 15:59:31 +0000
3+++ scripts/setup-mac.py 2013-03-13 22:28:19 +0000
4@@ -588,7 +588,11 @@
5 'sip',
6 'twisted.web.resource',
7 'twisted.web.client',
8- 'oauth',
9+ 'oauthlib.oauth1.common',
10+ 'oauthlib.oauth1.rfc5849',
11+ 'oauthlib.oauth1.rfc5849.parameters',
12+ 'oauthlib.oauth1.rfc5849.signature',
13+ 'oauthlib.oauth1.rfc5849.utils',
14 # workaround for indirect import in
15 # utils/__init__.py:
16 'ubuntu_sso.constants'

Subscribers

People subscribed via source and target branches