Merge branch 'release-1.13.2'

* release-1.13.2:
  Bumping version to 1.13.2
  Add changelog entries from botocore
  Change wording and add test cases
  Add documentation clarification for Resource BatchAction

.changes/1.13.2.json

@@ -0,0 +1,17 @@
+[
+  {
+    "category": "``apigateway``", 
+    "description": "[``botocore``] Update apigateway client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``ec2``", 
+    "description": "[``botocore``] Update ec2 client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``s3control``", 
+    "description": "[``botocore``] Update s3control client to latest version", 
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.13.2
+======
+
+* api-change:``apigateway``: [``botocore``] Update apigateway client to latest version
+* api-change:``ec2``: [``botocore``] Update ec2 client to latest version
+* api-change:``s3control``: [``botocore``] Update s3control client to latest version
+
+
 1.13.1
 ======
 

boto3/__init__.py

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

boto3/docs/collection.py

@@ -81,7 +81,11 @@ def document_collection_object(section, collection_model,
     if include_signature:
         section.style.start_sphinx_py_attr(collection_model.name)
     section.include_doc_string(
-        'A collection of %s resources' % collection_model.resource.type)
+        'A collection of %s resources.' % collection_model.resource.type)
+    section.include_doc_string(
+        'A %s Collection will include all resources by default, '
+        'and extreme caution should be taken when performing '
+        'actions on all resources.' % collection_model.resource.type)
 
 
 def document_batch_action(section, resource_name, event_emitter,
@@ -181,7 +185,11 @@ def document_collection_method(section, resource_name, action_name,
             'method_description': (
                 'Creates an iterable of all %s resources '
                 'in the collection filtered by kwargs passed to '
-                'method.' % collection_model.resource.type),
+                'method.' % collection_model.resource.type +
+                'A %s collection will include all resources by '
+                'default if no filters are provided, and extreme '
+                'caution should be taken when performing actions '
+                'on all resources.'% collection_model.resource.type),
             'example_prefix': '%s_iterator = %s.%s.filter' % (
                 xform_name(collection_model.resource.type),
                 example_resource_name, collection_model.name),

setup.cfg

@@ -3,6 +3,6 @@ universal = 1
 
 [metadata]
 requires-dist =
-    botocore>=1.16.1,<1.17.0
+    botocore>=1.16.2,<1.17.0
     jmespath>=0.7.1,<1.0.0
     s3transfer>=0.3.0,<0.4.0

setup.py

@@ -14,7 +14,7 @@
 
 
 requires = [
-    'botocore>=1.16.1,<1.17.0',
+    'botocore>=1.16.2,<1.17.0',
     'jmespath>=0.7.1,<1.0.0',
     's3transfer>=0.3.0,<0.4.0'
 ]

tests/unit/docs/test_collection.py

@@ -21,7 +21,10 @@ def test_document_collections(self):
         collection_documenter.document_collections(self.doc_structure)
         self.assert_contains_lines_in_order([
             '.. py:attribute:: samples',
-            '  A collection of Sample resources',
+            '  A collection of Sample resources.'
+             'A Sample Collection will include all resources by default, '
+             'and extreme caution should be taken when performing actions '
+             'on all resources.',
             '  .. py:method:: all()',
             ('    Creates an iterable of all Sample resources in the '
              'collection.'),
@@ -32,7 +35,10 @@ def test_document_collections(self):
             '    :returns: A list of Sample resources',
             '  .. py:method:: filter(**kwargs)',
             ('    Creates an iterable of all Sample resources in '
-             'the collection filtered by kwargs passed to method.'),
+             'the collection filtered by kwargs passed to method.'
+             'A Sample collection will include all resources by default '
+             'if no filters are provided, and extreme caution should be '
+             'taken when performing actions on all resources'),
             '    **Request Syntax** ',
             '    ::',
             '      sample_iterator = myservice.samples.filter(',
@@ -96,4 +102,4 @@ def test_document_collections(self):
             '    :rtype: list(:py:class:`myservice.Sample`)',
             '    :returns: A list of Sample resources',
             '    '
-        ])
+        ])