Update hacking for Python3
The repo is Python 3 now, so update hacking to version 3.0 which supports Python 3. Fix problems found. Change-Id: I2695f5a2371babfbf2a16565ff2ce5205a45fd2c
This commit is contained in:
parent
82c1595c12
commit
ceda1ba934
@ -180,8 +180,8 @@ def patch_swift_storlet_proxy_file(conf):
|
||||
# client configuration (we encountered this problem in a fuel swift
|
||||
# cluster).
|
||||
if 'proxy-logging' in line:
|
||||
line = 'pipeline = proxy-logging cache storlet_handler slo ' + \
|
||||
'proxy-logging proxy-server\n'
|
||||
line = ('pipeline = proxy-logging cache storlet_handler slo '
|
||||
'proxy-logging proxy-server\n')
|
||||
else:
|
||||
line = 'pipeline = cache storlet_handler slo proxy-server\n'
|
||||
sys.stdout.write(line)
|
||||
@ -245,5 +245,6 @@ def main(argv):
|
||||
else:
|
||||
usage(argv)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main(sys.argv)
|
||||
|
@ -183,6 +183,7 @@ class RunTimePaths(object):
|
||||
def host_dependency_cache_dir(self):
|
||||
return os.path.join(self.host_cache_root_dir, self.scope, 'dependency')
|
||||
|
||||
|
||||
"""---------------------------------------------------------------------------
|
||||
Docker Stateful Container API
|
||||
The RunTimeSandbox serve as an API between the Docker Gateway and
|
||||
@ -465,6 +466,7 @@ class RunTimeSandbox(object):
|
||||
else:
|
||||
self.logger.debug('Daemon started')
|
||||
|
||||
|
||||
"""---------------------------------------------------------------------------
|
||||
Storlet Daemon API
|
||||
StorletInvocationProtocol
|
||||
|
@ -2,7 +2,7 @@
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
|
||||
hacking>=0.11.0,<0.12
|
||||
hacking>=3.0,<3.1.0 # Apache-2.0
|
||||
|
||||
coverage>=3.6
|
||||
nose
|
||||
|
4
tox.ini
4
tox.ini
@ -86,7 +86,9 @@ commands =
|
||||
# H306: imports not in alphabetical order (time, os)
|
||||
# H404: multi line docstring should start without a leading new line
|
||||
# H405: multi line docstring summary not separated with an empty line
|
||||
ignore = E123,E125,H301,H306,H404,H405
|
||||
# W503 line break before binary operator
|
||||
# W504 line break after binary operator
|
||||
ignore = E123,E125,H301,H306,H404,H405,W503,W504
|
||||
show-source = True
|
||||
builtins = _
|
||||
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
|
||||
|
Loading…
x
Reference in New Issue
Block a user