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: I16995f9237168d16c834662876683760127aabb3
This commit is contained in:
parent
06439d33a5
commit
5a193ab20f
@ -2,7 +2,7 @@
|
|||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
hacking<0.13,>=0.12.0 # Apache-2.0
|
hacking>=3.0,<3.1.0 # Apache-2.0
|
||||||
|
|
||||||
sphinx>=2.0.0,!=2.1.0 # BSD
|
sphinx>=2.0.0,!=2.1.0 # BSD
|
||||||
openstackdocstheme>=2.0.0 # Apache-2.0
|
openstackdocstheme>=2.0.0 # Apache-2.0
|
||||||
|
3
tox.ini
3
tox.ini
@ -38,8 +38,9 @@ commands = oslo_debug_helper {posargs}
|
|||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
# E123, E125 skipped as they are invalid PEP-8.
|
# E123, E125 skipped as they are invalid PEP-8.
|
||||||
|
# W504 line break after binary operator
|
||||||
|
|
||||||
show-source = True
|
show-source = True
|
||||||
ignore = E123,E125
|
ignore = E123,E125,W504
|
||||||
builtins = _
|
builtins = _
|
||||||
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
|
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
|
||||||
|
@ -118,8 +118,8 @@ class ZunClient(rest_client.RestClient):
|
|||||||
def request(self, *args, **kwargs):
|
def request(self, *args, **kwargs):
|
||||||
resp, resp_body = super(ZunClient, self).request(*args, **kwargs)
|
resp, resp_body = super(ZunClient, self).request(*args, **kwargs)
|
||||||
if (CONTAINER_SERVICE_MICROVERSION and
|
if (CONTAINER_SERVICE_MICROVERSION and
|
||||||
CONTAINER_SERVICE_MICROVERSION
|
CONTAINER_SERVICE_MICROVERSION !=
|
||||||
!= api_version_utils.LATEST_MICROVERSION):
|
api_version_utils.LATEST_MICROVERSION):
|
||||||
api_version_utils.assert_version_header_matches_request(
|
api_version_utils.assert_version_header_matches_request(
|
||||||
self.api_microversion_header_name,
|
self.api_microversion_header_name,
|
||||||
get_container_service_api_version(),
|
get_container_service_api_version(),
|
||||||
|
Loading…
Reference in New Issue
Block a user