linting/bug fixes

nficano · nficano · commit 4b27802f7909 · 2017-10-10T11:11:02.000-04:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,18 +1,19 @@
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    sha: v0.8.0
+    sha: v0.9.5
     hooks:
     -   id: autopep8-wrapper
     -   id: check-ast
     -   id: check-case-conflict
     -   id: check-merge-conflict
-    -   id: detect-private-key
     -   id: double-quote-string-fixer
     -   id: end-of-file-fixer
     -   id: flake8
     -   id: requirements-txt-fixer
     -   id: trailing-whitespace
+    -   id: fix-encoding-pragma
+    -   id: debug-statements
 -   repo: https://github.com/asottile/reorder_python_imports
-    sha: v0.3.4
+    sha: v0.3.5
     hooks:
     -   id: reorder-python-imports
         language_version: python3.6
diff --git a/aws_lambda/aws_lambda.py b/aws_lambda/aws_lambda.py
@@ -78,7 +78,10 @@ def cleanup_old_versions(src, keep_last_versions, config_file='config.yaml'):
                           .format(version_number, e.message))
 
 
-def deploy(src, config_file='config.yaml', requirements=False, local_package=None):
+def deploy(
+    src, config_file='config.yaml', requirements=False,
+    local_package=None,
+):
     """Deploys a new function to AWS Lambda.
 
     :param str src:
@@ -97,15 +100,21 @@ def deploy(src, config_file='config.yaml', requirements=False, local_package=Non
     # Zip the contents of this folder into a single file and output to the dist
     # directory.
     path_to_zip_file = build(
-        src, config_file=config_file, requirements=requirements, local_package=local_package)
+        src, config_file=config_file,
+        requirements=requirements,
+        local_package=local_package,
+    )
 
     if function_exists(cfg, cfg.get('function_name')):
         update_function(cfg, path_to_zip_file)
     else:
         create_function(cfg, path_to_zip_file)
 
 
-def deploy_s3(src, config_file='config.yaml', requirements=False, local_package=None):
+def deploy_s3(
+    src, config_file='config.yaml', requirements=False,
+    local_package=None,
+):
     """Deploys a new function via AWS S3.
 
     :param str src:
@@ -124,7 +133,9 @@ def deploy_s3(src, config_file='config.yaml', requirements=False, local_package=
     # Zip the contents of this folder into a single file and output to the dist
     # directory.
     path_to_zip_file = build(
-        src, config_file=config_file, requirements=requirements, local_package=local_package)
+        src, config_file=config_file, requirements=requirements,
+        local_package=local_package,
+    )
 
     use_s3 = True
     s3_file = upload_s3(cfg, path_to_zip_file, use_s3)
@@ -134,7 +145,10 @@ def deploy_s3(src, config_file='config.yaml', requirements=False, local_package=
         create_function(cfg, path_to_zip_file, use_s3, s3_file)
 
 
-def upload(src, config_file='config.yaml', requirements=False, local_package=None):
+def upload(
+    src, config_file='config.yaml', requirements=False,
+    local_package=None,
+):
     """Uploads a new function to AWS S3.
 
     :param str src:
@@ -153,12 +167,17 @@ def upload(src, config_file='config.yaml', requirements=False, local_package=Non
     # Zip the contents of this folder into a single file and output to the dist
     # directory.
     path_to_zip_file = build(
-        src, config_file=config_file, requirements=requirements, local_package=local_package)
+        src, config_file=config_file, requirements=requirements,
+        local_package=local_package,
+    )
 
     upload_s3(cfg, path_to_zip_file)
 
 
-def invoke(src, event_file='event.json', config_file='config.yaml', verbose=False):
+def invoke(
+    src, event_file='event.json', config_file='config.yaml',
+    verbose=False,
+):
     """Simulates a call to your function.
 
     :param str src:
@@ -229,7 +248,10 @@ def init(src, minimal=False):
             copy(dest_path, src)
 
 
-def build(src, config_file='config.yaml', requirements=False, local_package=None):
+def build(
+    src, config_file='config.yaml', requirements=False,
+    local_package=None,
+):
     """Builds the file bundle.
 
     :param str src:
diff --git a/scripts/lambda b/scripts/lambda
@@ -1,9 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+import logging
 import os
+
 import click
+
 import aws_lambda
-import logging
 
 CURRENT_DIR = os.getcwd()
 
@@ -43,10 +45,13 @@ def init(folder, minimal):
     '--local-package', default=None, type=click.Path(),
     help='Install local package as well.', multiple=True,
 )
-def build(use_requirements, local_package):
+def build(use_requirements, local_package, config_file):
     aws_lambda.build(
-        CURRENT_DIR, config_file=config_file, use_requirements=use_requirements,
-        local_package=local_package)
+        CURRENT_DIR,
+        use_requirements=use_requirements,
+        local_package=local_package,
+        config_file=config_file,
+    )
 
 
 @click.command(help='Run a local test of your function.')
@@ -55,7 +60,11 @@ def build(use_requirements, local_package):
 @click.option('--verbose', '-v', is_flag=True)
 def invoke(event_file, config_file, verbose):
     aws_lambda.invoke(
-        CURRENT_DIR, event_file=event_file, config_file=config_file, verbose=verbose)
+        CURRENT_DIR,
+        event_file=event_file,
+        config_file=config_file,
+        verbose=verbose,
+    )
 
 
 @click.command(help='Register and deploy your code to lambda.')
@@ -68,10 +77,13 @@ def invoke(event_file, config_file, verbose):
     '--local-package', default=None, type=click.Path(),
     help='Install local package as well.', multiple=True,
 )
-def deploy(use_requirements, local_package):
+def deploy(use_requirements, local_package, config_file):
     aws_lambda.deploy(
-        CURRENT_DIR, config_file=config_file, use_requirements=use_requirements,
-        local_package=local_package)
+        CURRENT_DIR,
+        config_file=config_file,
+        use_requirements=use_requirements,
+        local_package=local_package,
+    )
 
 
 @click.command(help='Upload your lambda to S3.')
@@ -86,20 +98,37 @@ def deploy(use_requirements, local_package):
 def upload(use_requirements, local_package):
     aws_lambda.upload(CURRENT_DIR, use_requirements, local_package)
 
-@click.command(help="Deploy your lambda via S3.")
+
+@click.command(help='Deploy your lambda via S3.')
 @click.option('--config-file', default=None, 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, help='Install local package as well.', type=click.Path(), multiple=True)
-def deploy_s3(use_requirements, local_package):
+@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.',
+)
+def deploy_s3(use_requirements, local_package, config_file):
     aws_lambda.deploy_s3(
-        CURRENT_DIR, config_file=config_file, use_requirements=use_requirements,
-        local_package=local_package)
+        CURRENT_DIR, config_file=config_file,
+        use_requirements=use_requirements,
+        local_package=local_package,
+    )
 
-@click.command(help="Delete old versions of your functions")
+
+@click.command(help='Delete old versions of your functions')
 @click.option('--config-file', default=None, help='Alternate config file.')
-@click.option("--keep-last", type=int, prompt="Please enter the number of recent versions to keep")
-def cleanup(keep_last):
-    aws_lambda.cleanup_old_versions(CURRENT_DIR, keep_last, config_file=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(
+        CURRENT_DIR, keep_last, config_file=config_file,
+    )
 
 
 if __name__ == '__main__':
diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@ commit = True
 tag = True
 current_version = 2.2.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
-
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-
