Merge lp:~matt-goodall/canonical-identity-provider/no-more-bson-madness-other-than-bson-itself into lp:canonical-identity-provider/release

[Matt Goodall]

Upgrade oops-amqp to simplify bson dependency.

Fix bson madness:

- upgrade oops-amqp to version with no pymongo dependency
- remove pymongo dependency
- remove pip bson as it's already a deb dependency

[Matias Bordese (matiasb)]

LGTM

review: Approve

=== modified file 'requirements.txt'
--- requirements.txt	2015-11-18 16:24:16 +0000
+++ requirements.txt	2015-11-20 15:37:10 +0000
@@ -1,4 +1,3 @@
-bson==0.3.3
 canonical-raven==0.0.3
 convoy==0.4.1
 dj-static==0.0.6.dev1
@@ -17,13 +16,12 @@
 oath==1.4.0
 oauthlib==0.7.2
 oops==0.0.13
-oops-amqp==0.0.7
+oops-amqp==0.0.8b1
 oops-datedir-repo==0.0.22
 oops-dictconfig==0.0.6
 oops-timeline==0.0.2
 oops-wsgi==0.0.11
 paste==2.0.1
-pymongo==3.0.1
 raven==5.6.0
 requests-oauthlib==0.4.2
 static3==0.5.1.dev1
 
=== modified file 'src/identityprovider/tests/test_wsgi.py'
--- src/identityprovider/tests/test_wsgi.py	2014-12-01 11:10:45 +0000
+++ src/identityprovider/tests/test_wsgi.py	2015-11-20 15:37:10 +0000
@@ -52,7 +52,7 @@
         oops_path = self.oops_dir + '/' + todays_oops_path + '/' + oops_list[0]
         with open(oops_path, "r") as oops_file:
             oops_file_contents = oops_file.read()
-        return bson.decode_all(oops_file_contents)[0]
+        return bson.loads(oops_file_contents)
 
     def request_wsgi_response(self, environ):
         app = make_app()