Merge "Unskip some pep8 rules"

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'][

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)
 

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]