cleanup

Author: nficano

aws_lambda/aws_lambda.py

@@ -205,7 +205,7 @@ def invoke(
     # Tweak to allow module to import local modules
     try:
         sys.path.index(src)
-    except:
+    except ValueError:
         sys.path.append(src)
 
     handler = cfg.get('handler')
@@ -439,11 +439,11 @@ def get_role_name(region, account_id, role):
     return 'arn:{0}:iam::{1}:role/{2}'.format(prefix, account_id, role)
 
 
-def get_account_id(aws_access_key_id, aws_secret_access_key,region=None):
+def get_account_id(aws_access_key_id, aws_secret_access_key, region=None):
     """Query STS for a users' account_id"""
     client = get_client(
         'sts', aws_access_key_id, aws_secret_access_key,
-        region
+        region,
     )
     return client.get_caller_identity().get('Account')
 
@@ -467,7 +467,9 @@ def create_function(cfg, path_to_zip_file, *use_s3, **s3_file):
     aws_access_key_id = cfg.get('aws_access_key_id')
     aws_secret_access_key = cfg.get('aws_secret_access_key')
 
-    account_id = get_account_id(aws_access_key_id, aws_secret_access_key,cfg.get('region'))
+    account_id = get_account_id(
+        aws_access_key_id, aws_secret_access_key, cfg.get('region'),
+    )
     role = get_role_name(
         cfg.get('region'), account_id,
         cfg.get('role', 'lambda_basic_execution'),
@@ -537,7 +539,9 @@ def update_function(cfg, path_to_zip_file, *use_s3, **s3_file):
     aws_access_key_id = cfg.get('aws_access_key_id')
     aws_secret_access_key = cfg.get('aws_secret_access_key')
 
-    account_id = get_account_id(aws_access_key_id, aws_secret_access_key, cfg.get('region'))
+    account_id = get_account_id(
+        aws_access_key_id, aws_secret_access_key, cfg.get('region'),
+    )
     role = get_role_name(
         cfg.get('region'), account_id,
         cfg.get('role', 'lambda_basic_execution'),

scripts/lambda

@@ -19,7 +19,9 @@ def cli():
 
 @click.command(help='Create a new function for Lambda.')
 @click.option(
-    '--minimal', default=False, is_flag=True,
+    '--minimal',
+    default=False,
+    is_flag=True,
     help='Exclude any unnecessary template files',
 )
 @click.argument(
@@ -36,14 +38,23 @@ def init(folder, minimal):
 
 
 @click.command(help='Bundles package for deployment.')
-@click.option('--config-file', default='config.yaml', help='Alternate config file.')
 @click.option(
-    '--use-requirements', default=False, is_flag=True,
+    '--config-file',
+    default='config.yaml',
+    help='Alternate config file.',
+)
+@click.option(
+    '--use-requirements',
+    default=False,
+    is_flag=True,
     help='Install all packages defined in requirements.txt',
 )
 @click.option(
-    '--local-package', default=None, type=click.Path(),
-    help='Install local package as well.', multiple=True,
+    '--local-package',
+    default=None,
+    type=click.Path(),
+    help='Install local package as well.',
+    multiple=True,
 )
 def build(use_requirements, local_package, config_file):
     aws_lambda.build(
@@ -55,8 +66,16 @@ def build(use_requirements, local_package, config_file):
 
 
 @click.command(help='Run a local test of your function.')
-@click.option('--event-file', default='event.json', help='Alternate event file.')
-@click.option('--config-file', default='config.yaml', help='Alternate config file.')
+@click.option(
+    '--event-file',
+    default='event.json',
+    help='Alternate event file.',
+)
+@click.option(
+    '--config-file',
+    default='config.yaml',
+    help='Alternate config file.',
+)
 @click.option('--verbose', '-v', is_flag=True)
 def invoke(event_file, config_file, verbose):
     aws_lambda.invoke(
@@ -68,14 +87,23 @@ def invoke(event_file, config_file, verbose):
 
 
 @click.command(help='Register and deploy your code to lambda.')
-@click.option('--config-file', default='config.yaml', help='Alternate config file.')
 @click.option(
-    '--use-requirements', default=False, is_flag=True,
+    '--config-file',
+    default='config.yaml',
+    help='Alternate config file.',
+)
+@click.option(
+    '--use-requirements',
+    default=False,
+    is_flag=True,
     help='Install all packages defined in requirements.txt',
 )
 @click.option(
-    '--local-package', default=None, type=click.Path(),
-    help='Install local package as well.', multiple=True,
+    '--local-package',
+    default=None,
+    type=click.Path(),
+    help='Install local package as well.',
+    multiple=True,
 )
 def deploy(use_requirements, local_package, config_file):
     aws_lambda.deploy(
@@ -88,27 +116,40 @@ def deploy(use_requirements, local_package, config_file):
 
 @click.command(help='Upload your lambda to S3.')
 @click.option(
-    '--use-requirements', default=False, is_flag=True,
+    '--use-requirements',
+    default=False,
+    is_flag=True,
     help='Install all packages defined in requirements.txt',
 )
 @click.option(
-    '--local-package', default=None, type=click.Path(),
-    help='Install local package as well.', multiple=True,
+    '--local-package',
+    default=None,
+    type=click.Path(),
+    help='Install local package as well.',
+    multiple=True,
 )
 def upload(use_requirements, local_package):
     aws_lambda.upload(CURRENT_DIR, use_requirements, local_package)
 
 
 @click.command(help='Deploy your lambda via S3.')
-@click.option('--config-file', default='config.yaml', help='Alternate config file.')
 @click.option(
-    '--use-requirements', default=False, is_flag=True, help=(
-        'Install all packages defined in requirements.txt'
-    ),
+    '--config-file',
+    default='config.yaml',
+    help='Alternate config file.',
+)
+@click.option(
+    '--use-requirements',
+    default=False,
+    is_flag=True,
+    help='Install all packages defined in requirements.txt',
 )
 @click.option(
-    '--local-package', default=None, type=click.Path(),
-    multiple=True, help='Install local package as well.',
+    '--local-package',
+    default=None,
+    type=click.Path(),
+    multiple=True,
+    help='Install local package as well.',
 )
 def deploy_s3(use_requirements, local_package, config_file):
     aws_lambda.deploy_s3(
@@ -119,11 +160,15 @@ def deploy_s3(use_requirements, local_package, config_file):
 
 
 @click.command(help='Delete old versions of your functions')
-@click.option('--config-file', default='config.yaml', help='Alternate config file.')
 @click.option(
-    '--keep-last', type=int, prompt=(
-        'Please enter the number of recent versions to keep'
-    ),
+    '--config-file',
+    default='config.yaml',
+    help='Alternate config file.',
+)
+@click.option(
+    '--keep-last',
+    type=int,
+    prompt='Please enter the number of recent versions to keep',
 )
 def cleanup(keep_last, config_file):
     aws_lambda.cleanup_old_versions(

setup.cfg

@@ -3,7 +3,7 @@ commit = True
 tag = True
 current_version = 3.0.1
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
-serialize = 
+serialize =
 	{major}.{minor}.{patch}
 
 [bumpversion:file:setup.py]
@@ -15,4 +15,3 @@ universal = 1
 
 [flake8]
 exclude = docs
-

setup.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import pip
 import sys
+
+import pip
 from setuptools import find_packages
 from setuptools import setup
 
@@ -16,7 +17,8 @@
 if sys.version_info[0] == 2:
     pip_requirements = [str(r.req) for r in requirements]
 else:
-    pip_requirements = [str(r.req) for r in requirements if 'futures' not in str(r.req)]
+    pip_requirements = [str(r.req)
+                        for r in requirements if 'futures' not in str(r.req)]
 
 test_requirements = [
     # TODO: put package test requirements here