Merge "Bump hacking"
This commit is contained in:
commit
da08470122
@ -1,6 +1,3 @@
|
|||||||
# The order of packages is significant, because pip processes them in the order
|
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
|
||||||
# process, which may cause wedges in the gate later.
|
|
||||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||||
requests>=2.14.2 # Apache-2.0
|
requests>=2.14.2 # Apache-2.0
|
||||||
stevedore>=1.20.0 # Apache-2.0
|
stevedore>=1.20.0 # Apache-2.0
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
# The order of packages is significant, because pip processes them in the order
|
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
|
||||||
# process, which may cause wedges in the gate later.
|
|
||||||
# Hacking already pins down pep8, pyflakes and flake8
|
# Hacking already pins down pep8, pyflakes and flake8
|
||||||
hacking>=3.0,<3.1.0 # Apache-2.0
|
hacking>=6.1.0,<6.2.0 # Apache-2.0
|
||||||
|
|
||||||
# Unit testing
|
# Unit testing
|
||||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||||
|
@ -70,9 +70,9 @@ class Client(client.Client):
|
|||||||
if params.get("with_count"):
|
if params.get("with_count"):
|
||||||
count = queue_list.get("count", None)
|
count = queue_list.get("count", None)
|
||||||
|
|
||||||
return iterator._Iterator(self, queue_list, 'queues',
|
list_iter = iterator._Iterator(self, queue_list, 'queues',
|
||||||
self.queues_module.create_object(self)),\
|
self.queues_module.create_object(self))
|
||||||
count
|
return (list_iter, count)
|
||||||
|
|
||||||
@decorators.version(min_version=2)
|
@decorators.version(min_version=2)
|
||||||
def subscription(self, queue_name, **kwargs):
|
def subscription(self, queue_name, **kwargs):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user