Merge branch 'release-1.21.25' into develop

* release-1.21.25:
  Bumping version to 1.21.25
  Add changelog entries from botocore

.changes/1.21.25.json

@@ -0,0 +1,37 @@
+[
+  {
+    "category": "``redshift``",
+    "description": "[``botocore``] This release adds a new [--encrypted | --no-encrypted] field in restore-from-cluster-snapshot API. Customers can now restore an unencrypted snapshot to a cluster encrypted with AWS Managed Key or their own KMS key.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ebs``",
+    "description": "[``botocore``] Increased the maximum supported value for the Timeout parameter of the StartSnapshot API from 60 minutes to 4320 minutes.  Changed the HTTP error code for ConflictException from 503 to 409.",
+    "type": "api-change"
+  },
+  {
+    "category": "``gamesparks``",
+    "description": "[``botocore``] Released the preview of Amazon GameSparks, a fully managed AWS service that provides a multi-service backend for game developers.",
+    "type": "api-change"
+  },
+  {
+    "category": "``elasticache``",
+    "description": "[``botocore``] Doc only update for ElastiCache",
+    "type": "api-change"
+  },
+  {
+    "category": "``transfer``",
+    "description": "[``botocore``] Documentation updates for AWS Transfer Family to describe how to remove an associated workflow from a server.",
+    "type": "api-change"
+  },
+  {
+    "category": "``auditmanager``",
+    "description": "[``botocore``] This release updates 1 API parameter, the SnsArn attribute. The character length and regex pattern for the SnsArn attribute have been updated, which enables you to deselect an SNS topic when using the UpdateSettings operation.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ssm``",
+    "description": "[``botocore``] Update AddTagsToResource, ListTagsForResource, and RemoveTagsFromResource APIs to reflect the support for tagging Automation resources. Includes other minor documentation updates.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,18 @@
 CHANGELOG
 =========
 
+1.21.25
+=======
+
+* api-change:``redshift``: [``botocore``] This release adds a new [--encrypted | --no-encrypted] field in restore-from-cluster-snapshot API. Customers can now restore an unencrypted snapshot to a cluster encrypted with AWS Managed Key or their own KMS key.
+* api-change:``ebs``: [``botocore``] Increased the maximum supported value for the Timeout parameter of the StartSnapshot API from 60 minutes to 4320 minutes.  Changed the HTTP error code for ConflictException from 503 to 409.
+* api-change:``gamesparks``: [``botocore``] Released the preview of Amazon GameSparks, a fully managed AWS service that provides a multi-service backend for game developers.
+* api-change:``elasticache``: [``botocore``] Doc only update for ElastiCache
+* api-change:``transfer``: [``botocore``] Documentation updates for AWS Transfer Family to describe how to remove an associated workflow from a server.
+* api-change:``auditmanager``: [``botocore``] This release updates 1 API parameter, the SnsArn attribute. The character length and regex pattern for the SnsArn attribute have been updated, which enables you to deselect an SNS topic when using the UpdateSettings operation.
+* api-change:``ssm``: [``botocore``] Update AddTagsToResource, ListTagsForResource, and RemoveTagsFromResource APIs to reflect the support for tagging Automation resources. Includes other minor documentation updates.
+
+
 1.21.24
 =======
 

boto3/__init__.py

@@ -17,7 +17,7 @@
 from boto3.session import Session
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.21.24'
+__version__ = '1.21.25'
 
 
 # The default Boto3 session; autoloaded when needed.

setup.cfg

@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-    botocore>=1.24.24,<1.25.0
+    botocore>=1.24.25,<1.25.0
     jmespath>=0.7.1,<2.0.0
     s3transfer>=0.5.0,<0.6.0
 

setup.py

@@ -13,7 +13,7 @@
 
 
 requires = [
-    'botocore>=1.24.24,<1.25.0',
+    'botocore>=1.24.25,<1.25.0',
     'jmespath>=0.7.1,<2.0.0',
     's3transfer>=0.5.0,<0.6.0',
 ]