From bf2c2d717fe866e971cdd2b62ccabebae8d936ca Mon Sep 17 00:00:00 2001 From: Felipe Monteiro Date: Thu, 5 Oct 2017 15:48:23 +0100 Subject: [PATCH] Unskip some pep8 rules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unskip some pep8 rules that aren't unreasonably annoying: E121 - continuation line under-indented for hanging indent E122 - continuation line missing indentation or outdented E123 - closing bracket does not match indentation of opening bracket’s line E124 - closing bracket does not match visual indentation E125 - continuation line with same indent as next logical line E126 - continuation line over-indented for hanging indent E251 - unexpected spaces around keyword / parameter equals Change-Id: Idf2640fc2d10715a687c46c3e853122ce38109ee --- deckhand/factories.py | 2 +- deckhand/tests/unit/db/base.py | 2 +- tox.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deckhand/factories.py b/deckhand/factories.py index 73ab1b3c..76a16563 100644 --- a/deckhand/factories.py +++ b/deckhand/factories.py @@ -189,7 +189,7 @@ class DocumentFactory(DeckhandFactory): # Set name. layer_template = copy.deepcopy(layer_template) layer_template['metadata']['name'] = "%s%d" % ( - layer_name, count + 1) + layer_name, count + 1) # Set layer. layer_template['metadata']['layeringDefinition'][ diff --git a/deckhand/tests/unit/db/base.py b/deckhand/tests/unit/db/base.py index 21808182..6ad366ae 100644 --- a/deckhand/tests/unit/db/base.py +++ b/deckhand/tests/unit/db/base.py @@ -108,7 +108,7 @@ class TestDbBase(base.DeckhandWithDBTestCase): for attr in BASE_EXPECTED_FIELDS: if attr.endswith('_at'): self.assertThat(obj[attr], matchers.MatchesAny( - matchers.Is(None), matchers.IsInstance(str))) + matchers.Is(None), matchers.IsInstance(str))) else: self.assertIsInstance(obj[attr], bool) diff --git a/tox.ini b/tox.ini index 18c3016f..1779fd6d 100644 --- a/tox.ini +++ b/tox.ini @@ -78,7 +78,7 @@ commands = flake8 {posargs} # [H210] Require ‘autospec’, ‘spec’, or ‘spec_set’ in mock.patch/mock.patch.object calls # [H904] Delay string interpolations at logging calls. enable-extensions = H106,H203,H204,H205,H210,H904 -ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H405 +ignore = E127,E128,E129,E131,H405 exclude = .venv,.git,.tox,dist,*lib/python*,*egg,build,releasenotes,doc [testenv:docs]