Canonical SSO provider

Merge lp:~matt-goodall/canonical-identity-provider/bson-reality into lp:canonical-identity-provider/release

  1. bson-reality
  2. Merge into trunk
Proposed by Matt Goodall
Status: Merged
Approved by: Matt Goodall
Approved revision: no longer in the source branch.
Merged at revision: 1373
Proposed branch: lp:~matt-goodall/canonical-identity-provider/bson-reality
Merge into: lp:canonical-identity-provider/release
Diff against target: 20 lines (+1/-1)
2 files modified
dependencies.txt (+0/-1)
requirements.txt (+1/-0)
To merge this branch: bzr merge lp:~matt-goodall/canonical-identity-provider/bson-reality
Reviewer Review Type Date Requested Status
Fabián Ezequiel Gallina (community) Approve
Review via email: mp+279087@code.launchpad.net

Commit message

Update bson dependencies to reflect what actually happens.

Description of the change

This doesn't actually change anything but correctly reflects where the venv's bson package comes from.

oops_amqp requires bson, so the bson wheel is installed implicitly and masks the deb when in the venv.

To post a comment you must log in.
Revision history for this message
Fabián Ezequiel Gallina (fgallina) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dependencies.txt'
2--- dependencies.txt 2014-10-29 14:49:13 +0000
3+++ dependencies.txt 2015-12-01 10:00:10 +0000
4@@ -2,7 +2,6 @@
5 python-amqplib
6 python-bcrypt
7 python-beautifulsoup
8-python-bson
9 python-iso8601
10 python-launchpadlib
11 python-lxml
12
13=== modified file 'requirements.txt'
14--- requirements.txt 2015-11-20 15:33:40 +0000
15+++ requirements.txt 2015-12-01 10:00:10 +0000
16@@ -1,3 +1,4 @@
17+bson==0.3.3
18 canonical-raven==0.0.3
19 convoy==0.4.1
20 dj-static==0.0.6.dev1