Merge branch 'upstream_master' into slim_handler

# Conflicts:
#	README.md
#	tests/tests.py
#	zappa/cli.py

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,31 @@
+<!--- Provide a general summary of the issue in the Title above -->
+## Context
+<!--- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug -->
+<!--- Also, please make sure that you are running Zappa _from a virtual environment_ and are using Python 2.7 --> 
+
+## Expected Behavior
+<!--- Tell us what should happen -->
+
+## Actual Behavior
+<!--- Tell us what happens instead -->
+
+## Possible Fix
+<!--- Not obligatory, but suggest a fix or reason for the bug -->
+
+## Steps to Reproduce
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Context
+<!--- How has this bug affected you? What were you trying to accomplish? -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Zappa version used:
+* Operating System and Python version:
+* Link to your project (optional):
+* Your `zappa_settings.py`: 

.gitignore

@@ -61,6 +61,9 @@ docs/_build/
 # PyBuilder
 target/
 
+# pyenv
+.python-version
+
 # PyCharm
 #  Project settings from the PyCharm IDE are stored in the .idea folder
 .idea/

.travis.yml

@@ -14,7 +14,7 @@ env:
   - TESTCASE=tests/tests.py
 script: 
   - nosetests $TESTCASE --with-coverage --cover-package=zappa --with-timer
-  - coverage combine --append
+    #  - coverage combine --append
 after_success:
   coveralls
 notifications:

CHANGELOG.md

@@ -1,6 +1,24 @@
 # Zappa Changelog
 
-# 0.32.0
+## 0.34.0
+* Adds `--since` and `--filter` to `tail`
+* Fixes `unschedule` command when used with specific stage
+
+## 0.33.0
+* Adds `package` command
+* Forbids the use of unicode environment variable keys
+* Initialize wsgi.errors to sys.stderr (was '')
+* Accept `AWS_SESSION_TOKEN` when executing via an IAM role (#589)
+* Set `REMOTE_USER` even when using `iam_authorization`
+* Rename `lets_encrypt_schedule` to `lets_encrypt_expression` (#571)
+* Messages in `tail` are now sequential
+* Bump version requirements, update README
+* Various other small changes
+
+## 0.32.1
+* File `tail` broken in CLI refactor
+
+## 0.32.0
 * Add Cognito Authorizers
 * Refactor CLI, add Bash Completion
 * Improve manylinux wheels

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Rich Jones
+Copyright (c) 2017 Rich Jones
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

docs/config.rst

@@ -2,7 +2,7 @@
 Configuration Reference
 =======================
 
-Envirnments, such as *dev*, *staging*, and *production* are configured in the *zappa_settings.json* file.  Here is an example of defining many of the available settings:
+Stages, such as *dev*, *staging*, and *production* are configured in the *zappa_settings.json* file.  Here is an example of defining many of the available settings:
 
 ::
 

docs/quickstart.rst

@@ -31,13 +31,13 @@ Running the Initial Setup / Settings
 This will automatically detect your application type and help you define your deployment configuration settings. Once you finish initialization, you'll have a file named *zappa_settings.json* in your project directory defining your deployment settings. It will probably look something like this: ::
 
     {
-        "dev": { // The name of your environment
+        "dev": { // The name of your stage
             "s3_bucket": "lmbda", // The name of your S3 bucket
             "app_function": "your_module.app" // The python path to your WSGI application function. In Flask, this is your 'app' object.
         }
     }
 
-You can define as many environments as you like. We recommend having dev, staging, and production.
+You can define as many stages as you like. We recommend having dev, staging, and production.
 
 Now, you're ready to deploy!
 
@@ -47,7 +47,7 @@ Basic Usage
 Initial Deployments
 -------------------
 
-Once your settings are configured, you can package and deploy your application to an environment called "production" with a single command: ::
+Once your settings are configured, you can package and deploy your application to a stage called "production" with a single command: ::
 
     $ zappa deploy production
     Deploying..

example/requirements.txt

@@ -1,2 +1,2 @@
-Flask==0.11.1
+Flask>=0.12
 zappa>=0.17.6

example/zappa_settings.json

@@ -5,7 +5,7 @@
        "debug": true,
        "log_level": "DEBUG",
        "events": [{
-         "function": "dev_event_zappa_test_flask_app",
+         "function": "mymodule.myfunc",
          "expression": "rate(1 minute)"
          }],
        "aws_region": "us-west-2",

requirements.txt

@@ -1,21 +1,22 @@
-argcomplete==1.7.0
+argcomplete==1.8.1
 base58==0.2.4
-botocore==1.4.87
-boto3==1.4.2
+botocore==1.5.6
+boto3==1.4.4
 docutils>=0.12
+durationpy==0.3
 futures==3.0.5
 hjson==2.0.2
 jmespath==0.9.0
 kappa==0.6.0
-lambda-packages==0.11.0
+lambda-packages==0.12.0
 python-dateutil==2.6.0
 python-slugify==1.2.1
 PyYAML==3.12
 requests>=2.10.0
 six==1.10.0
 toml==0.9.2
-tqdm==4.10.0
+tqdm==4.11.2
 troposphere>=1.9.0
-Werkzeug==0.11.11
+Werkzeug==0.11.15
 wheel==0.29.0
 wsgi-request-logger==0.4.6

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name='zappa',
-    version='0.32.0',
+    version='0.34.0',
     packages=['zappa'],
     install_requires=required,
     tests_require=test_required,

test_requirements.txt

@@ -1,6 +1,8 @@
-coveralls==1.1
-Django==1.10.4
-mock==2.0.0
-nose==1.3.7
-nose-timer==0.6.0
-placebo==0.8.1
+coveralls>=1.1
+coverage>=4.3.1
+Django>=1.10.5
+Flask>=0.12
+mock>=2.0.0
+nose>=1.3.7
+nose-timer>=0.6.0
+placebo>=0.8.1

test_settings.json

@@ -12,7 +12,7 @@
        "delete_local_zip": true,
        "debug": true,
        "parameter_depth": 2,
-       "prebuild_script": "test_settings.prebuild_me",
+       "prebuild_script": "tests.test_app.prebuild_me",
        "events": [
            {
                "function": "tests.test_app.schedule_me",
@@ -78,5 +78,15 @@
        "environment_variables": {
           "EXTENDO": "You bet"
        }
+    },
+    "build_package_only_delete_local_zip_false": {
+      "delete_local_zip": false,
+      "use_precompiled_packages": false,
+      "delete_s3_zip": false
+    },
+    "build_package_only_delete_local_zip_true": {
+      "delete_local_zip": true,
+      "use_precompiled_packages": false,
+      "delete_s3_zip": false
     }
 }

tests/test_app.py

@@ -18,3 +18,6 @@ def schedule_me():
 def callback(self):
     print("this is a callback")
 
+def prebuild_me():
+    print("this is a prebuild script")
+