From 393b270951ea545aa58ccb1f70245465f1f1c853 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 30 Mar 2020 08:33:20 +0200 Subject: [PATCH] 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 --- murano_tempest_tests/tests/api/service_broker/base.py | 2 +- test-requirements.txt | 2 +- tox.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/murano_tempest_tests/tests/api/service_broker/base.py b/murano_tempest_tests/tests/api/service_broker/base.py index faa63ca..471f191 100644 --- a/murano_tempest_tests/tests/api/service_broker/base.py +++ b/murano_tempest_tests/tests/api/service_broker/base.py @@ -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'] diff --git a/test-requirements.txt b/test-requirements.txt index 5a879f9..9b2494a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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 diff --git a/tox.ini b/tox.ini index eca57a7..349fa3a 100644 --- a/tox.ini +++ b/tox.ini @@ -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