Merge pull request #720 from awslabs/develop

Release: 0.6.1 Release

Author: sriram-mv

.travis.yml

@@ -6,6 +6,13 @@ python:
   - "2.7"
   - "3.6"
 
+# Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs
+matrix:
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
+
 install:
   # Install the code requirements
   - make init

DEVELOPMENT_GUIDE.rst

@@ -14,7 +14,7 @@ Environment Setup
 
 1. Install Python Versions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
-We support both Python 2.7 and 3.6 versions.
+We support Python 2.7, 3.6 and 3.7 versions.
 Follow the idioms from this `excellent cheatsheet`_ to make sure your code is compatible with both Python versions.
 Our CI/CD pipeline is setup to run unit tests against both Python versions. So make sure you test it with both
 versions before sending a Pull Request. `pyenv`_ is a great tool to easily setup multiple Python versions.
@@ -24,16 +24,19 @@ versions before sending a Pull Request. `pyenv`_ is a great tool to easily setup
 #. Install PyEnv - ``curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash``
 #. ``pyenv install 2.7.14``
 #. ``pyenv install 3.6.4``
-#. Make both Python versions available in the project: ``pyenv local 3.6.4 2.7.14``
+#. ``pyenv install 3.7.0``
+#. Make Python versions available in the project: ``pyenv local 3.6.4 2.7.14 3.7.0``
 
 
 2. Activate Virtualenv
 ~~~~~~~~~~~~~~~~~~~~~~
 Virtualenv allows you to install required libraries outside of the Python installation. A good practice is to setup
 a different virtualenv for each project. `pyenv`_ comes with a handy plugin that can create virtualenv.
 
-#. Create new virtualenv if it does not exist: ``pyenv virtualenv 2.7.14 samcli27`` and ``pyenv virtualenv 3.6.4 samcli36``
-#. ``pyenv activate samcli27`` for Python2.7 or ``pyenv activate samcli36`` for Python3.6
+Depending on the python version, the following commands would change to be the appropriate python version.
+
+#. ``pyenv virtualenv 3.7.0 samcli37``
+#. ``pyenv activate samcli37`` for Python3.7
 
 
 3. Install dev version of SAM CLI
@@ -42,7 +45,7 @@ We will install a development version of SAM CLI from source into the virtualenv
 make changes. We will install in a command called ``samdev`` to keep it separate from a global SAM CLI installation,
 if any.
 
-#. Activate Virtualenv: ``pyenv activate samcli27`` or ``pyenv activate samcli36``
+#. Activate Virtualenv: ``pyenv activate samcli37``
 #. Install dev CLI: ``make init``
 #. Make sure installation succeeded: ``which samdev``
 

README.rst

@@ -45,7 +45,7 @@ Get Started
 
 Learn how to get started using the SAM CLI with these guides:
 
--  `Installation <docs/installation.rst>`__: Set up your MacOs, Linux or Windows Machine to run serverless projects with SAM CLI.
+-  `Installation <docs/installation.rst>`__: Set up your macOS, Linux or Windows Machine to run serverless projects with SAM CLI.
 -  `Introduction to SAM and SAM CLI <docs/getting_started.rst>`__ What is SAM and SAM CLI, and how can you use it to make a simple hello-world app.
 -  `Running and debugging serverless applications locally <docs/usage.rst>`__: Describes how to use SAM CLI for invoking Lambda functions locally, running automated tests, fetching logs, and debugging applications
 -  `Packaging and deploying your application <docs/deploying_serverless_applications.rst>`__: Deploy your local application using an S3 bucket, and AWS CloudFormation.

docs/deploying_serverless_applications.rst

@@ -23,7 +23,7 @@ Next, open a command prompt and type the following:
 
     sam package \
         --template-file path/template.yaml \
-        --output-template-file packaged.yaml \
+        --output-template-file serverless-output.yaml \
         --s3-bucket s3-bucket-name
 
 The package command returns an AWS SAM template named serverless-output.yaml that contains the CodeUri that points to the deployment zip in the Amazon S3 bucket that you specified. This template represents your serverless application. You are now ready to deploy it.
@@ -36,7 +36,7 @@ To deploy the application, run the following command:
 .. code:: bash
 
     sam deploy \
-        --template-file serverless-template.yaml \
+        --template-file serverless-output.yaml \
         --stack-name new-stack-name \
         --capabilities CAPABILITY_IAM
 

docs/installation.rst

@@ -18,7 +18,16 @@ environment variable to contact the docker daemon.
 -  **Windows**: `Docker
    For Windows (create an account & follow through to download from the Docker Store) <https://www.docker.com/docker-windows>`__
 -  **Linux**: Check your distro’s package manager (e.g. yum install docker)
-
+      *** for Centos 7.5 System requirements are::
+         yum install gcc zip py-pip py-setuptools ca-certificates groff  python-dev g++ make docker epel-release python-pip python-devel\
+                     python-tools
+          **run post install of above**
+          pip install --upgrade pip
+          pip install --upgrade setuptools
+          pip install --upgrade aws-sam-cli
+        *** if you want to use the lambda-local option(without running it as root) you will need to add your user to the docker group ***
+         usermod -a -G Docker yourUserName
+     
 **Note for macOS and Windows users**: SAM CLI requires that the project directory
 (or any parent directory) is listed in `Docker file sharing options <https://docs.docker.com/docker-for-mac/osxfs/>`__.
 
@@ -176,6 +185,31 @@ Install with PyEnv
     # Verify your installation worked
     $ sam –-version
 
+Updating SAM CLI on AWS Cloud9
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If your AWS Cloud9 environment has a SAM CLI version < 0.3.0 installed there are a few extra steps you must do to upgrade to newer versions:
+
+.. code:: bash
+
+    # Uninstall the older version of SAM Local
+    $ npm uninstall -g aws-sam-local
+   
+    # Remove the symlink 
+    $ rm -rf $(which sam)
+   
+    # Install the CLI
+    $ pip install --user aws-sam-cli
+   
+    # Create new symlink
+    $ ln -sf $(which sam) ~/.c9/bin/sam
+    
+    # Reset the bash cache
+    $ hash -r
+   
+    # Verify your installation worked
+    $ sam –-version
+
 Troubleshooting
 ---------------