Merge lp:~ricardokirkner/python-oops-amqp/no-pymongo-for-bson into lp:python-oops-amqp

Proposed by Ricardo Kirkner
Status: Merged
Approved by: James Westby
Approved revision: 23
Merged at revision: 21
Proposed branch: lp:~ricardokirkner/python-oops-amqp/no-pymongo-for-bson
Merge into: lp:python-oops-amqp
Diff against target: 58 lines (+8/-4)
3 files modified
NEWS (+4/-0)
oops_amqp/__init__.py (+2/-2)
setup.py (+2/-2)
To merge this branch: bzr merge lp:~ricardokirkner/python-oops-amqp/no-pymongo-for-bson
Reviewer Review Type Date Requested Status
James Westby (community) Approve
Ricardo Kirkner (community) Approve
Fabián Ezequiel Gallina (community) Approve
Review via email: mp+273263@code.launchpad.net

Commit message

do not depend on pymongo when bson is all we need

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

LGTM

review: Approve
Revision history for this message
Ricardo Kirkner (ricardokirkner) :
review: Approve
Revision history for this message
Ricardo Kirkner (ricardokirkner) :
review: Approve
23. By Ricardo Kirkner

record dropping pymongo in NEWS file

Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2012-08-10 02:38:21 +0000
+++ NEWS 2015-10-08 14:49:37 +0000
@@ -6,6 +6,10 @@
6NEXT6NEXT
7----7----
88
9* Dropped dependency on pymongo in favor of bson. This avoids having
10 to depend both on bson and pymongo when installing in conjunction
11 with oops-datedir-repo. (Ricardo Kirkner)
12
90.0.7130.0.7
10-----14-----
1115
1216
=== modified file 'oops_amqp/__init__.py'
--- oops_amqp/__init__.py 2012-08-10 03:06:16 +0000
+++ oops_amqp/__init__.py 2015-10-08 14:49:37 +0000
@@ -54,7 +54,7 @@
5454
55From time to time your AMQP server may be unavailable. If that happens then55From time to time your AMQP server may be unavailable. If that happens then
56the Publisher will not assign an oops id - it will return None to signal that56the Publisher will not assign an oops id - it will return None to signal that
57the publication failed. To prevent losing the OOPS its a good idea to have a 57the publication failed. To prevent losing the OOPS its a good idea to have a
58fallback publisher - either another AMQP publisher (to a different server) or58fallback publisher - either another AMQP publisher (to a different server) or
59one that spools locally (where you can pick up the OOPSes via rsync or some59one that spools locally (where you can pick up the OOPSes via rsync or some
60other mechanism. Using the oops standard helper publish_with_fallback will let60other mechanism. Using the oops standard helper publish_with_fallback will let
@@ -97,7 +97,7 @@
97# established at this point, and setup.py will use a version of next-$(revno).97# established at this point, and setup.py will use a version of next-$(revno).
98# If the releaselevel is 'final', then the tarball will be major.minor.micro.98# If the releaselevel is 'final', then the tarball will be major.minor.micro.
99# Otherwise it is major.minor.micro~$(revno).99# Otherwise it is major.minor.micro~$(revno).
100__version__ = (0, 0, 8, 'beta', 0)100__version__ = (0, 0, 8, 'beta', 1)
101101
102__all__ = [102__all__ = [
103 'Publisher',103 'Publisher',
104104
=== modified file 'setup.py'
--- setup.py 2012-08-10 03:04:59 +0000
+++ setup.py 2015-10-08 14:49:37 +0000
@@ -23,7 +23,7 @@
23 os.path.join(os.path.dirname(__file__), 'README'), 'rb').read()23 os.path.join(os.path.dirname(__file__), 'README'), 'rb').read()
2424
25setup(name="oops_amqp",25setup(name="oops_amqp",
26 version="0.0.8",26 version="0.0.8b1",
27 description=\27 description=\
28 "OOPS AMQP transport.",28 "OOPS AMQP transport.",
29 long_description=description,29 long_description=description,
@@ -40,7 +40,7 @@
40 'Programming Language :: Python',40 'Programming Language :: Python',
41 ],41 ],
42 install_requires = [42 install_requires = [
43 'pymongo',43 'bson',
44 'oops>=0.0.11',44 'oops>=0.0.11',
45 'amqplib',45 'amqplib',
46 ],46 ],

Subscribers

People subscribed via source and target branches

to all changes: