Merge branch 'brian-qpid-transport' into bmbouter-qpid-docs-changes

2014-03-18 16:18:41 -04:00 · 2014-03-18 16:18:41 -04:00 · 57515e34ae
parent 94ae94015b cb772ade57
commit 57515e34ae
3 changed files with 5 additions and 4 deletions
--- a/requirements/extras/qpid.txt
+++ b/requirements/extras/qpid.txt
@ -1,2 +1,2 @@
-qpid-python
-qpid-tools
+qpid-python>=0.26
+qpid-tools>=0.26
--- a/requirements/funtest.txt
+++ b/requirements/funtest.txt
@ -24,5 +24,5 @@ django-kombu
 boto

 # Qpid transport
-qpid-python
-qpid-tools
+qpid-python>=0.26
+qpid-tools>=0.26
--- a/setup.py
+++ b/setup.py
@ -135,6 +135,7 @@ extras_require = extra['extras_require'] = {
    'librabbitmq': extras('librabbitmq.txt'),
    'pyro': extras('pyro.txt'),
    'slmq': extras('slmq.txt'),
+    'qpid': extras('qpid.txt'),
 }

 setup(