chore: merge release/v1.13.0 into master

Author: jlhood

.travis.yml

@@ -1,9 +1,13 @@
 # Enable container based builds
 sudo: false
+dist: xenial   # required for Python >= 3.7
 language: python
 
 matrix:
   include:
+    - python: 3.7
+      env:
+        - TOXENV=py37
     - python: 3.6
       env:
         - TOXENV=py36
@@ -21,17 +25,3 @@ install:
 script:
 # Runs unit tests
 - tox
-
-# Build docs pages only from master branch
-- if [ "$TRAVIS_BRANCH" = "master" ]; then make build-docs; fi
-
-deploy:
-# Deploy the docs to Github Pages *only* from master branch
-- provider: pages
-  skip_cleanup: true
-  local_dir: docs/website/_build/html
-  github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard
-  keep-history: true
-  on:
-      branch: master
-

DEVELOPMENT_GUIDE.rst

@@ -17,10 +17,8 @@ steps manually.
 
 1. Install Python Versions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
-Python 2.7 is our officially supported Python version. We have a future goal to support to Python3.6 but the code base
-currently does not work with Python3. To make future migration easier, any new code we write must be compatible with
-Python3. Follow the idioms from this `excellent cheatsheet`_ to make sure your code is compatible with both Python
-versions.
+Our officially supported Python versions are 2.7, 3.6, and 3.7. Follow the idioms from this `excellent cheatsheet`_ to
+make sure your code is compatible with both Python 2.7 and 3 versions.
 
 Setup Python locally using `pyenv`_
 

Makefile

@@ -47,11 +47,6 @@ test:
 	$(info [*] Run the unit test with minimum code coverage of $(CODE_COVERAGE)%...)
 	@pytest --cov samtranslator --cov-report term-missing --cov-fail-under $(CODE_COVERAGE) tests
 
-build-docs:
-	$(info [*] Build documentation...)
-	@pip install -r docs/website/requirements.txt
-	@$(MAKE) -C docs/website html
-
 # Command to run everytime you make changes to verify everything works
 dev: flake test
 

README.md

@@ -1,21 +1,93 @@
-[![Build Status](https://travis-ci.org/awslabs/serverless-application-model.svg?branch=develop)](https://travis-ci.org/awslabs/serverless-application-model)
-[![PyPI version](https://badge.fury.io/py/aws-sam-translator.svg)](https://badge.fury.io/py/aws-sam-translator)
-[![Codecov Test Coverage](https://codecov.io/gh/awslabs/serverless-application-model/branch/master/graphs/badge.svg?style=flat)](https://codecov.io/gh/awslabs/serverless-application-model)
-
-![Logo](aws_sam_introduction.png)
+<p align="center">
+</p>
 
 # AWS Serverless Application Model (AWS SAM)
-You can use SAM to define serverless applications in simple and clean syntax.
 
-This GitHub project is the starting point for AWS SAM. It contains the SAM specification, the code that translates SAM templates into AWS CloudFormation stacks, general information about the model, and examples of common applications.
+![Apache-2.0](https://img.shields.io/github/license/awslabs/serverless-application-model.svg)
+![SAM_CLI release](https://img.shields.io/github/release/awslabs/aws-sam-cli.svg?label=CLI%20Version)
+
+The AWS Serverless Application Model (SAM) is an open-source framework for building serverless applications. 
+It provides shorthand syntax to express functions, APIs, databases, and event source mappings. 
+With just a few lines of configuration, you can define the application you want and model it.
+
+[![Getting Started with AWS SAM](./docs/get-started-youtube.png)](https://www.youtube.com/watch?v=1dzihtC5LJ0)
+
+## Get Started
+
+To get started with building SAM-based applications, use the SAM CLI. SAM CLI provides a Lambda-like execution 
+environment that lets you locally build, test, debug, and deploy applications defined by SAM templates.
+
+* [Install SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
+* [Build & Deploy a "Hello World" Web App](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-quick-start.html)
+* [Install AWS Toolkit](https://aws.amazon.com/getting-started/tools-sdks/#IDE_and_IDE_Toolkits) to use SAM with your favorite IDEs.
+
+
+**Next Steps:** Learn to build a more complex serverless application.
+* [Extract text from images and store in a database](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-example-s3.html) using Amazon S3 and Amazon Rekognition services.
+* [Detect when records are added to a database](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-example-ddb.html) using Amazon DynamoDB database and asynchronous stream processing.
+
+
+**Detailed References:** Explains SAM commands and usage in depth.
+* [CLI Commands](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-command-reference.html)
+* [SAM Template Specification](https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md)
+* [Policy Templates](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-policy-templates.html)
+
+## Why SAM
+
++ **Single\-deployment configuration**\. SAM makes it easy to organize related components and resources, and operate on a single stack\. You can use SAM to share configuration \(such as memory and timeouts\) between resources, and deploy all related resources together as a single, versioned entity\.
+   
++ **Local debugging and testing**\. Use SAM CLI to locally build, test, and debug SAM applications on a Lambda-like execution environment. It tightens the development loop by helping you find & troubleshoot issues locally that you might otherwise identify only after deploying to the cloud.
+
++ **Deep integration with development tools**. You can use SAM with a suite of tools you love and use.
+    + IDEs: [PyCharm](https://aws.amazon.com/pycharm/), [IntelliJ](https://aws.amazon.com/intellij/), [Visual Studio Code](https://aws.amazon.com/visualstudiocode/), [Visual Studio](https://aws.amazon.com/visualstudio/), [AWS Cloud9](https://aws.amazon.com/cloud9/)
+    + Build: [CodeBuild](https://docs.aws.amazon.com/codebuild/latest/userguide/)
+    + Deploy: [CodeDeploy](https://docs.aws.amazon.com/codedeploy/latest/userguide/), [Jenkins](https://wiki.jenkins.io/display/JENKINS/AWS+SAM+Plugin)
+    + Continuous Delivery Pipelines: [CodePipeline](https://docs.aws.amazon.com/codepipeline/latest/userguide/) 
+    + Discover Serverless Apps & Patterns: [AWS Serverless Application Repository](https://docs.aws.amazon.com/serverlessrepo/latest/devguide/)
+
++ **Built\-in best practices**\. You can use SAM to define and deploy your infrastructure as configuration. This makes it possible for you to use and enforce best practices through code reviews. Also, with a few lines of configuration, you can enable safe deployments through CodeDeploy, and can enable tracing using AWS X\-Ray\.
+
++ **Extension of AWS CloudFormation**\. Because SAM is an extension of AWS CloudFormation, you get the reliable deployment capabilities of AWS CloudFormation\. You can define resources by using CloudFormation in your SAM template\. Also, you can use the full suite of resources, intrinsic functions, and other template features that are available in CloudFormation\.
+
+## What is this Github repository? 💻
+
+This GitHub repository contains the SAM Specification, the Python code that translates SAM templates into AWS CloudFormation stacks and lots of examples applications. 
+In the words of SAM developers:
+
+> SAM Translator is the Python code that deploys SAM templates via AWS CloudFormation. Source code is high quality (95% unit test coverage), 
+with tons of tests to ensure your changes don't break compatibility. Change the code, run the tests, and if they pass, you should be good to go! 
+Clone it and run `make pr`!
+
+## Contribute to SAM
+
+We love our contributors ❤️ We have over 100 contributors who have built various parts of the product. 
+Read this [testimonial from @ndobryanskyy](https://www.lohika.com/aws-sam-my-exciting-first-open-source-experience/) to learn
+more about what it was like contributing to SAM. 
+
+Depending on your interest and skill, you can help build the different parts of the SAM project; 
+
+**Enhance the SAM Specification**
+
+Make pull requests, report bugs, and share ideas to improve the full SAM template specification.
+Source code is located on Github at [awslabs/serverless-application-model](https://github.com/awslabs/serverless-application-model). 
+Read the [SAM Specification Contributing Guide](https://github.com/awslabs/serverless-application-model/blob/master/CONTRIBUTING.md)
+to get started.
+    
+**Strengthen SAM CLI**
+
+Add new commands or enhance existing ones, report bugs, or request new features for the SAM CLI.
+Source code is located on Github at [awslabs/aws-sam-cli](https://github.com/awslabs/aws-sam-cli). Read the [SAM CLI Contributing Guide](https://github.com/awslabs/aws-sam-cli/blob/develop/CONTRIBUTING.md) to 
+get started. 
+
+**Update SAM Developer Guide**
 
-The SAM specification and implementation are open sourced under the Apache 2.0 license. The current version of the SAM specification is available at [AWS SAM 2016-10-31](versions/2016-10-31.md).
+[SAM Developer Guide](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/index.html) provides comprehensive getting started guide and reference documentation.
+Source code is located on Github at [awsdocs/aws-sam-developer-guide](https://github.com/awsdocs/aws-sam-developer-guide).
+Read the [SAM Documentation Contribution Guide](https://github.com/awsdocs/aws-sam-developer-guide/blob/master/CONTRIBUTING.md) to get
+started. 
 
-Documentation about using AWS SAM to define, test, and deploy serverless applications is available at [AWS Serverless Application Model Developer Guide](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/what-is-sam.html).
+### Join the SAM Community on Slack
+[Join the SAM developers channel (#samdev)](https://join.slack.com/t/awsdevelopers/shared_invite/enQtMzg3NTc5OTM2MzcxLTdjYTdhYWE3OTQyYTU4Njk1ZWY4Y2ZjYjBhMTUxNGYzNDg5MWQ1ZTc5MTRlOGY0OTI4NTdlZTMwNmI5YTgwOGM/) on Slack to collaborate with fellow community members and the AWS SAM team.
 
-## Contributing new features and enhancements to SAM
-You can build serverless applications faster and further simplify your development of serverless applications by defining new event sources, new resource types, and new parameters within SAM. Additionally, you can modify SAM to integrate it with other frameworks and deployment providers from the community for building serverless applications.
 
-[Read the Development Guide](DEVELOPMENT_GUIDE.rst) for in-depth information on how to start making changes.
 
-[Join the SAM developers channel (#samdev) on Slack](https://join.slack.com/t/awsdevelopers/shared_invite/enQtMzg3NTc5OTM2MzcxLTdjYTdhYWE3OTQyYTU4Njk1ZWY4Y2ZjYjBhMTUxNGYzNDg5MWQ1ZTc5MTRlOGY0OTI4NTdlZTMwNmI5YTgwOGM/) to collaborate with fellow community members and the AWS SAM team.

docs/cloudformation_compatibility.rst

@@ -171,6 +171,7 @@ BinaryMediaTypes                    All
 MinimumCompressionSize              All
 Cors                                All
 TracingEnabled                      All
+OpenApiVersion                      None
 ================================== ======================== ========================
 
 

docs/get-started-youtube.png

@@ -88,6 +88,7 @@ Currently, the following resources and properties are being supported:
       AccessLogSetting:
       CanarySetting:
       TracingEnabled:
+      OpenApiVersion:
 
     SimpleTable:
       # Properties of AWS::Serverless::SimpleTable