From ba81aca6d10d4034b724b4fb32cbf9f8c282028f Mon Sep 17 00:00:00 2001 From: Keeton Hodgson Date: Tue, 25 Sep 2018 09:43:57 -0700 Subject: [PATCH 1/2] Revert "docs: remove reference to InlineCode which is unreleased" This reverts commit 196a5936d5c429f8847ea24ac77fe909db4c0714. --- versions/2016-10-31.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/versions/2016-10-31.md b/versions/2016-10-31.md index f7189794e..c6b217875 100644 --- a/versions/2016-10-31.md +++ b/versions/2016-10-31.md @@ -103,7 +103,8 @@ Property Name | Type | Description ---|:---:|--- Handler | `string` | **Required.** Function within your code that is called to begin execution. Runtime | `string` | **Required.** The runtime environment. -CodeUri | `string` | [S3 Location Object](#s3-location-object) | **Required.** S3 Uri or location to the function code. The S3 object this Uri references MUST be a [Lambda deployment package](http://docs.aws.amazon.com/lambda/latest/dg/deployment-package-v2.html). +CodeUri | `string` | [S3 Location Object](#s3-location-object) | **Either CodeUri or InlineCode must be specified.** S3 Uri or location to the function code. The S3 object this Uri references MUST be a [Lambda deployment package](http://docs.aws.amazon.com/lambda/latest/dg/deployment-package-v2.html). +InlineCode | `string` | **Either CodeUri or InlineCode must be specified.** The inline code for the lambda. FunctionName | `string` | A name for the function. If you don't specify a name, a unique name will be generated for you. [More Info](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-functionname) Description | `string` | Description of the function. MemorySize | `integer` | Size of the memory allocated per invocation of the function in MB. Defaults to 128. From edbcc0d2a42adcf60c7e5147ac3990ce24eec0bc Mon Sep 17 00:00:00 2001 From: Sriram Madapusi Vasudevan <3770774+TheSriram@users.noreply.github.com> Date: Tue, 18 Sep 2018 15:05:07 -0700 Subject: [PATCH 2/2] fix: conditionally install enum34 based on python version (#582) --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index af1106503..86742d26e 100755 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ boto3~=1.5 -enum34~=1.1 +enum34~=1.1; python_version<"3.4" jsonschema~=2.6 six~=1.11