From f66397a3cc3a6b3bc04a8d4eb34a1125f5fa85fb Mon Sep 17 00:00:00 2001 From: Dantali0n Date: Wed, 30 Jun 2021 16:54:09 +0200 Subject: [PATCH] Fix zuul builds with dependencies and pep8 rules This updates hacking to 3.2 thereby removing the pyflakes dependency. In addition pep8 rules W503 is disabled in favor of the more recent W504. Co-authored-by: limin.lc Change-Id: Id274b1b577b12a7dc1e659949b08b05ddfc661e8 --- test-requirements.txt | 8 ++------ tox.ini | 2 +- watcher_tempest_plugin/tests/client_functional/v1/base.py | 2 +- watcher_tempest_plugin/tests/scenario/base.py | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 32d0800..9ac9b7f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,11 +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 -# remove this pyflakes from here once you bump the -# hacking to 3.2.0 or above. hacking 3.2.0 takes -# care of pyflakes version compatibilty. -pyflakes>=2.1.1 +hacking>=3.2.,<3.3 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 doc8>=0.6.0 # Apache-2.0 @@ -20,5 +16,5 @@ openstackdocstheme>=2.2.1 # Apache-2.0 reno>=3.1.0 # Apache-2.0 # bandit -bandit>=1.1.0 # Apache-2.0 +bandit>=1.6.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 0e738d8..35e1f79 100644 --- a/tox.ini +++ b/tox.ini @@ -55,7 +55,7 @@ commands = oslo_debug_helper {posargs} [flake8] show-source=True -ignore= H105,E123,E226,N320,H202 +ignore= H105,E123,E226,N320,H202,W503 builtins= _ enable-extensions = H106,H203 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,demo/,releasenotes diff --git a/watcher_tempest_plugin/tests/client_functional/v1/base.py b/watcher_tempest_plugin/tests/client_functional/v1/base.py index ccb56b2..7835343 100644 --- a/watcher_tempest_plugin/tests/client_functional/v1/base.py +++ b/watcher_tempest_plugin/tests/client_functional/v1/base.py @@ -61,7 +61,7 @@ def execute(cmd, fail_ok=False, merge_stderr=False): class TestCase(testtools.TestCase): - delimiter_line = re.compile('^\+\-[\+\-]+\-\+$') + delimiter_line = re.compile(r'^\+\-[\+\-]+\-\+$') api_version = 1.0 diff --git a/watcher_tempest_plugin/tests/scenario/base.py b/watcher_tempest_plugin/tests/scenario/base.py index 0c4c2eb..948c7ee 100644 --- a/watcher_tempest_plugin/tests/scenario/base.py +++ b/watcher_tempest_plugin/tests/scenario/base.py @@ -106,8 +106,8 @@ class BaseInfraOptimScenarioTest(manager.ScenarioTest): for service in cls.get_compute_nodes_setup() if service['state'] == 'up') return ( - len(available_hypervisors) == len(available_services) and - len(hypervisors) >= 2) + len(available_hypervisors) == len(available_services) + and len(hypervisors) >= 2) except Exception as exc: LOG.exception(exc) return False