From c483dee1f306b698448fbee9169038159209e916 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 27 Mar 2020 19:33:12 +0100 Subject: Update hacking for Python3 The repo is Python 3 now, so update hacking to version 3.0 which supports Python 3. Blacklist: W503 line break before binary operator W504 line break after binary operator Fix: E123 closing bracket does not match indentation of opening bracket's line E126 continuation line over-indented for hanging indent Change-Id: I39003496a3f4be5a4cb05cdbae53a9c097e34e14 --- oslo_policy/tests/test_generator.py | 2 +- oslo_policy/tests/test_sphinxpolicygen.py | 4 ++-- test-requirements.txt | 2 +- tox.ini | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/oslo_policy/tests/test_generator.py b/oslo_policy/tests/test_generator.py index 147ef2d..bb3ee89 100644 --- a/oslo_policy/tests/test_generator.py +++ b/oslo_policy/tests/test_generator.py @@ -595,7 +595,7 @@ class ListRedundantTestCase(base.PolicyBaseTestCase): deprecated_rule=deprecated_rule, deprecated_reason='reason', deprecated_since='T') - ) + ) # Mock out stevedore to return the configured enforcer ext = stevedore.extension.Extension(name='testing', entry_point=None, diff --git a/oslo_policy/tests/test_sphinxpolicygen.py b/oslo_policy/tests/test_sphinxpolicygen.py index b709d67..ad65ec3 100644 --- a/oslo_policy/tests/test_sphinxpolicygen.py +++ b/oslo_policy/tests/test_sphinxpolicygen.py @@ -73,8 +73,8 @@ class SingleSampleGenerationTest(base.BaseTestCase): mock.call(args=[ '--config-file', '/opt/nova/nova.conf', '--output-file', '/opt/nova/nova.policy.yaml.sample'], - conf=mock.ANY), + conf=mock.ANY), mock.call(args=[ '--config-file', '/opt/nova/placement.conf', '--output-file', '/opt/nova/placement.policy.yaml.sample'], - conf=mock.ANY)]) + conf=mock.ANY)]) diff --git a/test-requirements.txt b/test-requirements.txt index 8103913..29e6739 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=1.1.0,<1.2.0 # Apache-2.0 +hacking>=3.0,<3.1.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 requests-mock>=1.2.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 6b29f08..cd5530d 100644 --- a/tox.ini +++ b/tox.ini @@ -44,7 +44,9 @@ commands = [flake8] show-source = True -ignore = +# W503 line break before binary operator +# W504 line break after binary operator +ignore = W503,W504 builtins = _ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build -- cgit v1.2.1