Merge pull request #30 from brettswift/feature/support_flake8_360

Flake8 got more picky. Fix it
brettswift · Oct 25, 2018 · 3d6b09d · 3d6b09d
2 parents 32377c8 + 13bb750
commit 3d6b09d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 27 deletions.
diff --git a/cumulus/chain/step.py b/cumulus/chain/step.py
@@ -11,4 +11,4 @@ def __init__(self):
 
     def handle(self, chain_context):
         # type: (chaincontext.ChainContext) -> None
-        raise NotImplemented("handle must be implemented")
+        raise NotImplementedError("handle must be implemented")
diff --git a/cumulus/steps/dev_tools/code_build_action.py b/cumulus/steps/dev_tools/code_build_action.py
@@ -140,10 +140,10 @@ def create_project(self, chain_context, codebuild_role, codebuild_environment, n
             )
             chain_context.template.add_resource(sg)
             vpc_config = {'VpcConfig': codebuild.VpcConfig(
-                    VpcId=self.vpc_config.vpc_id,
-                    Subnets=self.vpc_config.subnets,
-                    SecurityGroupIds=[Ref(sg)],
-                )}
+                VpcId=self.vpc_config.vpc_id,
+                Subnets=self.vpc_config.subnets,
+                SecurityGroupIds=[Ref(sg)],
+            )}
 
         project_name = "Project%s" % name
 

diff --git a/cumulus/types/codebuild/buildaction.py b/cumulus/types/codebuild/buildaction.py
@@ -9,11 +9,11 @@ def __init__(self, **kwargs):
         super(SourceS3Action, self).__init__(**kwargs)
 
         self.ActionTypeId = troposphere.codepipeline.ActionTypeId(
-                Category="Source",
-                Owner="AWS",
-                Version="1",
-                Provider='S3',
-            )
+            Category="Source",
+            Owner="AWS",
+            Version="1",
+            Provider='S3',
+        )
         self.RunOrder = "1"
 
 
@@ -25,11 +25,11 @@ def __init__(self, **kwargs):
         super(SourceCodeCommitAction, self).__init__(**kwargs)
 
         self.ActionTypeId = troposphere.codepipeline.ActionTypeId(
-                Category="Source",
-                Owner="AWS",
-                Version="1",
-                Provider="CodeCommit",
-            )
+            Category="Source",
+            Owner="AWS",
+            Version="1",
+            Provider="CodeCommit",
+        )
         self.RunOrder = "1"
 
 
@@ -41,11 +41,11 @@ def __init__(self, **kwargs):
         super(CodeBuildAction, self).__init__(**kwargs)
 
         self.ActionTypeId = troposphere.codepipeline.ActionTypeId(
-                Category="Build",
-                Owner="AWS",
-                Version="1",
-                Provider="CodeBuild"
-            )
+            Category="Build",
+            Owner="AWS",
+            Version="1",
+            Provider="CodeBuild"
+        )
         self.RunOrder = "1"
 
 
@@ -57,11 +57,11 @@ def __init__(self, **kwargs):
         super(LambdaAction, self).__init__(**kwargs)
 
         self.ActionTypeId = troposphere.codepipeline.ActionTypeId(
-                Category="Invoke",
-                Owner="AWS",
-                Version="1",
-                Provider='Lambda',
-            )
+            Category="Invoke",
+            Owner="AWS",
+            Version="1",
+            Provider='Lambda',
+        )
         self.RunOrder = "1"
 
 

diff --git a/setup.cfg b/setup.cfg
@@ -15,6 +15,7 @@ replace = __version__ = '{new_version}'
 universal = 1
 
 [flake8]
+ignore = W605  # this is for components/userdata/windows.py
 exclude = docs
 max-line-length = 140
 

diff --git a/tests/stacker_test/blueprints/s3_bucket.py b/tests/stacker_test/blueprints/s3_bucket.py
@@ -13,6 +13,6 @@ def create_template(self):
         t = self.template
 
         t.add_resource(Bucket(
-           "S3Bucket",
-           BucketName='bswift-int-test-asdf'
+            "S3Bucket",
+            BucketName='bswift-int-test-asdf'
         ))