Update hacking for Python3

The repo is Python 3 now, so update hacking to version 2.0 which
supports Python 3.

Fix problems found.

Update local hacking checks for new flake8.

Change-Id: I2683bc1a7c962da137de4b77aac450f08d1f6c4a
This commit is contained in:
Andreas Jaeger 2020-03-30 08:33:20 +02:00
parent 4ad3e1b81f
commit 393b270951
3 changed files with 3 additions and 3 deletions

View File

@ -99,7 +99,7 @@ class BaseServiceBrokerTest(test.BaseTestCase):
while start_status:
status = self.service_broker_client.get_last_status(instance_id)
if status == start_status and time.time() - start_time > timeout:
raise exceptions.TimeoutException
raise exceptions.TimeoutException
elif status != start_status:
try:
parced_stat = status['state']

View File

@ -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.13,>=0.12.0 # Apache-2.0
hacking>=2.0,<2.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
python-subunit>=1.0.0 # Apache-2.0/BSD

View File

@ -38,6 +38,6 @@ commands = oslo_debug_helper {posargs}
# E123, E125 skipped as they are invalid PEP-8.
show-source = True
ignore = E123,E125
ignore = E123,E125,W504
builtins = _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build