Merge branch 'release-0.0.14'

Conflicts:
	CHANGELOG.rst
	boto3/__init__.py
	setup.py

.coveragerc

@@ -2,5 +2,3 @@
 branch = True
 include =
     boto3/*
-omit =
-    boto3/docs.py

.travis.yml

@@ -4,10 +4,10 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
-  - "pypy"
 sudo: false
 install:
   - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then travis_retry pip install -r requirements26.txt; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == 2.* ]]; then travis_retry pip install -r requirements2.txt; fi
   - travis_retry pip install -r requirements.txt
   - travis_retry pip install coverage python-coveralls
 script: nosetests --with-coverage --cover-erase

CHANGELOG.rst

@@ -1,6 +1,28 @@
 Changelog
 =========
 
+0.0.14 - 2015-04-02
+-------------------
+
+* feature:Resources: Update to the latest resource models for:
+
+  * AWS CloudFormation
+  * Amazon EC2
+  * AWS IAM
+
+* feature:Amazon S3:  Add an ``upload_file`` and ``download_file``
+  to S3 clients that transparently handle parallel multipart transfers.
+* feature:Botocore: Update to Botocore 0.102.0.
+
+  * Add support for Amazon Machine Learning.
+  * Add support for Amazon Workspaces.
+  * Update ``requests`` to 2.6.0.
+  * Update AWS Lambda to the latest API.
+  * Update Amazon EC2 Container Service to the latest API.
+  * Update Amazon S3 to the latest API.
+  * Add ``DBSnapshotCompleted`` support to Amazon RDS waiters.
+  * Fixes for the REST-JSON protocol.
+
 0.0.13 - 2015-04-02
 -------------------
 

README.rst

@@ -13,7 +13,7 @@ services that are supported.
 Boto 3 is in **developer preview**.  This means that until a 1.0 release
 occurs, some of the interfaces may change based on your feedback.
 Once a 1.0 release happens, we guarantee backwards compatibility
-for all future 1.x.x releases.  Try out boto3 and give us
+for all future 1.x.x releases.  Try out Boto 3 and give us
 `feedback <https://github.com/boto/boto3/issues>`__ today!
 
 .. _boto: https://docs.pythonboto.org/

boto3/__init__.py

@@ -17,7 +17,7 @@
 
 
 __author__ = 'Amazon Web Services'
-__version__ = '0.0.13'
+__version__ = '0.0.14'
 
 
 # The default Boto3 session; autoloaded when needed.

boto3/compat.py

@@ -0,0 +1,31 @@
+# Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+import sys
+import os
+import errno
+
+
+if sys.platform.startswith('win'):
+    def rename_file(current_filename, new_filename):
+        try:
+            os.remove(new_filename)
+        except OSError as e:
+            if not e.errno == errno.ENOENT:
+                # We only want to a ignore trying to remove
+                # a file that does not exist.  If it fails
+                # for any other reason we should be propagating
+                # that exception.
+                raise
+        os.rename(current_filename, new_filename)
+else:
+    rename_file = os.rename

boto3/data/resources/cloudformation-2010-05-15.resources.json

@@ -44,13 +44,19 @@
   "resources": {
     "Event": {
       "identifiers": [
-        { "name": "Id" }
+        {
+          "name": "Id",
+          "memberName": "EventId"
+        }
       ],
       "shape": "StackEvent"
     },
     "Stack": {
       "identifiers": [
-        { "name": "Name" }
+        {
+          "name": "Name",
+          "memberName": "StackName"
+        }
       ],
       "shape": "Stack",
       "load": {
@@ -135,8 +141,11 @@
     },
     "StackResource": {
       "identifiers": [
-        { "name": "LogicalId", "memberName": "LogicalResourceId" },
-        { "name": "StackName" }
+        { "name": "StackName" },
+        {
+          "name": "LogicalId",
+          "memberName": "LogicalResourceId"
+        }
       ],
       "shape": "StackResourceDetail",
       "load": {
@@ -162,8 +171,11 @@
     },
     "StackResourceSummary": {
       "identifiers": [
-        { "name": "LogicalId", "memberName": "LogicalResourceId" },
-        { "name": "StackName" }
+        { "name": "StackName" },
+        {
+          "name": "LogicalId",
+          "memberName": "LogicalResourceId"
+        }
       ],
       "shape": "StackResourceSummary",
       "has": {

boto3/data/resources/ec2-2014-10-01.resources.json

@@ -65,7 +65,7 @@
         "resource": {
           "type": "PlacementGroup",
           "identifiers": [
-            { "target": "Id", "source": "requestParameter", "path": "GroupName" }
+            { "target": "Name", "source": "requestParameter", "path": "GroupName" }
           ]
         }
       },
@@ -122,7 +122,7 @@
       "CreateVolume": {
         "request": { "operation": "CreateVolume" },
         "resource": {
-          "type": "Image",
+          "type": "Volume",
           "identifiers": [
             { "target": "Id", "source": "response", "path": "VolumeId" }
           ],
@@ -593,17 +593,17 @@
         "path": "Reservations[0].Instances[0]"
       },
       "actions": {
-        "AttachVolume": {
+        "AttachClassicLinkVpc": {
           "request": {
-            "operation": "AttachVolume",
+            "operation": "AttachClassicLinkVpc",
             "params": [
               { "target": "InstanceId", "source": "identifier", "name": "Id" }
             ]
           }
         },
-        "AttachClassicLinkVpc": {
+        "AttachVolume": {
           "request": {
-            "operation": "AttachClassicLinkVpc",
+            "operation": "AttachVolume",
             "params": [
               { "target": "InstanceId", "source": "identifier", "name": "Id" }
             ]
@@ -838,6 +838,13 @@
         }
       },
       "waiters": {
+        "Exists": {
+          "waiterName": "InstanceExists",
+          "params": [
+            { "target": "InstanceIds[]", "source": "identifier", "name": "Id" }
+          ],
+          "path": "Reservations[0].Instances[0]"
+        },
         "Running": {
           "waiterName": "InstanceRunning",
           "params": [
@@ -1314,6 +1321,14 @@
               { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" }
             ]
           }
+        },
+        "Delete": {
+          "request": {
+            "operation": "DeleteRouteTable",
+            "params": [
+              { "target": "RouteTableId", "source": "identifier", "name": "Id" }
+            ]
+          }
         }
       },
       "has": {
@@ -1546,6 +1561,15 @@
           }
         }
       },
+      "waiters": {
+        "Completed": {
+          "waiterName": "SnapshotCompleted",
+          "params": [
+            { "target": "SnapshotIds[]", "source": "identifier", "name": "Id" }
+          ],
+          "path": "Snapshots[]"
+        }
+      },
       "has": {
         "Volume": {
           "resource": {