Merge "Update hacking version"
This commit is contained in:
commit
e6f79b8da5
|
@ -206,8 +206,8 @@ class ObjectVersionChecker(object):
|
|||
"""Follow a chain of remotable things down to the original function."""
|
||||
if isinstance(thing, classmethod):
|
||||
return self._find_remotable_method(cls, thing.__get__(None, cls))
|
||||
elif (inspect.ismethod(thing)
|
||||
or inspect.isfunction(thing)) and hasattr(thing, 'remotable'):
|
||||
elif (inspect.ismethod(thing) or
|
||||
inspect.isfunction(thing)) and hasattr(thing, 'remotable'):
|
||||
return self._find_remotable_method(cls, thing.original_fn,
|
||||
parent_was_remotable=True)
|
||||
elif parent_was_remotable:
|
||||
|
@ -370,8 +370,8 @@ class ObjectVersionChecker(object):
|
|||
for my_version, child_version in versions:
|
||||
_my_version = vutils.convert_version_to_tuple(my_version)
|
||||
_ch_version = vutils.convert_version_to_tuple(child_version)
|
||||
if not (last_my_version < _my_version
|
||||
and last_child_version <= _ch_version):
|
||||
if not (last_my_version < _my_version and
|
||||
last_child_version <= _ch_version):
|
||||
raise AssertionError(('Object %s relationship %s->%s for '
|
||||
'field %s is out of order') % (
|
||||
obj_class.obj_name(),
|
||||
|
|
|
@ -20,8 +20,8 @@ Some black magic for inline callbacks.
|
|||
|
||||
"""
|
||||
|
||||
import eventlet
|
||||
eventlet.monkey_patch(os=False)
|
||||
import eventlet # noqa
|
||||
eventlet.monkey_patch(os=False) # noqa
|
||||
|
||||
import inspect
|
||||
import mock
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# 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!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
||||
hacking>=1.1.0,<1.2.0 # Apache-2.0
|
||||
oslotest>=3.2.0 # Apache-2.0
|
||||
testtools>=2.2.0 # MIT
|
||||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
|
|
Loading…
Reference in New Issue