Merge branch 'master' of github.com:nficano/python-lambda

nficano · nficano · commit dc14146b5ac5 · 2017-06-08T14:06:46.000-04:00
* 'master' of github.com:nficano/python-lambda: Bumped version Issue nficano#31 Issue nficano#44: Support multiple local_packages Issue: nficano#44 Turn on support for multiple options Fix init trying to copy a __pycache__ directory Added missing instruction to README.md Update README.rst Say which local files are being bundled. The Zope hack.
diff --git a/README.rst b/README.rst
@@ -12,6 +12,10 @@ python-λ
 
 Python-lambda is a toolset for developing and deploying *serverless* Python code in AWS Lambda.
 
+A call for contributors
+=======================
+With python-lambda and `pytube <https://github.com/nficano/pytube/>`_ both continuing to gain momentum, I'm calling for contributors to help build out new features, review pull requests, fix bugs, and maintain overall code quality. If you're interested, please email me at nficano[at]gmail.com.
+
 Description
 ===========
 
@@ -32,7 +36,9 @@ Requirements
 Getting Started
 ===============
 
-Begin by creating a new virtualenv and project folder.
+First, you must create an IAM Role on your AWS account called `lambda_basic_execution` with the `LambdaBasicExecution` policy attached.
+
+On your computer, create a new virtualenv and project folder.
 
 .. code:: bash
 
diff --git a/aws_lambda/__init__.py b/aws_lambda/__init__.py
@@ -2,7 +2,7 @@
 # flake8: noqa
 __author__ = 'Nick Ficano'
 __email__ = 'nficano@gmail.com'
-__version__ = '0.7.0'
+__version__ = '0.7.1'
 
 from .aws_lambda import deploy, invoke, init, build, cleanup_old_versions
 
diff --git a/aws_lambda/aws_lambda.py b/aws_lambda/aws_lambda.py
@@ -3,6 +3,7 @@
 import json
 import logging
 import os
+import sys
 import time
 from imp import load_source
 from shutil import copy, copyfile
@@ -110,6 +111,12 @@ def invoke(src, alt_event=None, verbose=False):
         path_to_event_file = os.path.join(src, 'event.json')
     event = read(path_to_event_file, loader=json.loads)
 
+    #Tweak to allow module to import local modules
+    try:
+        sys.path.index(src)
+    except:
+        sys.path.append(src)
+
     handler = cfg.get('handler')
     # Inspect the handler string (<module>.<function name>) and translate it
     # into a function we can execute.
@@ -142,8 +149,10 @@ def init(src, minimal=False):
     for filename in os.listdir(templates_path):
         if (minimal and filename == 'event.json') or filename.endswith('.pyc'):
             continue
-        destination = os.path.join(templates_path, filename)
-        copy(destination, src)
+        dest_path = os.path.join(templates_path, filename)
+
+        if not os.path.isdir(dest_path):
+            copy(dest_path, src)
 
 
 def build(src, requirements=False, local_package=None):
@@ -176,6 +185,13 @@ def build(src, requirements=False, local_package=None):
                           requirements=requirements,
                           local_package=local_package)
 
+    # Hack for Zope.
+    if "zope" in os.listdir(path_to_temp):
+        print("Zope packages detected; fixing Zope package paths to make them importable.")
+        # Touch.
+        with open(os.path.join(path_to_temp, "zope/__init__.py"), "wb"):
+            pass
+
     # Gracefully handle whether ".zip" was included in the filename or not.
     output_filename = ('{0}.zip'.format(output_filename)
                        if not output_filename.endswith('.zip')
@@ -188,6 +204,7 @@ def build(src, requirements=False, local_package=None):
                 continue
             if filename == 'config.yaml':
                 continue
+            print("Bundling: %r" % filename)
             files.append(os.path.join(src, filename))
 
     # "cd" into `temp_path` directory.
@@ -288,7 +305,10 @@ def pip_install_to_target(path, requirements=False, local_package=None):
         print('No dependency packages installed!')
 
     if local_package is not None:
-        packages.append(local_package)
+        if not isinstance(local_package, (list, tuple) ):
+            local_package = [local_package]
+        for l_package in local_package:
+            packages.append(l_package)
     _install_packages(path, packages)
 
 
diff --git a/scripts/lambda b/scripts/lambda
@@ -28,7 +28,7 @@ def init(folder):
 
 @click.command(help="Bundles package for deployment.")
 @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())
+@click.option('--local-package', default=None, help='Install local package as well.', type=click.Path(), multiple=True)
 def build(use_requirements, local_package):
     aws_lambda.build(CURRENT_DIR, use_requirements, local_package)
 
@@ -42,7 +42,7 @@ def invoke(event_file, verbose):
 
 @click.command(help="Register and deploy your code to lambda.")
 @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())
+@click.option('--local-package', default=None, help='Install local package as well.', type=click.Path(), multiple=True)
 def deploy(use_requirements, local_package):
     aws_lambda.deploy(CURRENT_DIR, use_requirements, local_package)
 
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.0
+current_version = 0.7.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@
 
 setup(
     name='python-lambda',
-    version='0.7.0',
+    version='0.7.1',
     description="The bare minimum for a Python app running on Amazon Lambda.",
     long_description=readme + '\n\n' + history,
     author="Nick Ficano",
