Merge lp:~mikemc/ubuntuone-windows-installer/use-oauthlib into lp:ubuntuone-windows-installer

Proposed by Mike McCracken
Status: Merged
Approved by: Brian Curtin
Approved revision: 164
Merged at revision: 164
Proposed branch: lp:~mikemc/ubuntuone-windows-installer/use-oauthlib
Merge into: lp:ubuntuone-windows-installer
Diff against target: 12 lines (+1/-1)
1 file modified
scripts/devsetup/buildout.cfg (+1/-1)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-windows-installer/use-oauthlib
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve
Review via email: mp+148045@code.launchpad.net

Commit message

- Update buildout to include oauthlib instead of oauth to work with current trunk.

Description of the change

- Update buildout to include oauthlib instead of oauth to work with current trunk.

To post a comment you must log in.
Revision history for this message
Brian Curtin (brian.curtin) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/devsetup/buildout.cfg'
2--- scripts/devsetup/buildout.cfg 2012-12-10 19:52:15 +0000
3+++ scripts/devsetup/buildout.cfg 2013-02-12 20:55:23 +0000
4@@ -91,7 +91,7 @@
5 mocker
6 coverage
7 pep8
8- oauth
9+ oauthlib
10 simplejson
11 pylint
12 pyflakes

Subscribers

People subscribed via source and target branches