Merge branch 'release-1.18.26' into develop

aws-sdk-python-automation · aws-sdk-python-automation · commit a9e9f038954e · 2021-08-20T18:35:21.000Z
* release-1.18.26:
  Bumping version to 1.18.26
  Add changelog entries from botocore
diff --git a/.changes/1.18.26.json b/.changes/1.18.26.json
@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``eks``",
+    "description": "[``botocore``] Adds support for EKS add-ons \"preserve\" flag, which allows customers to maintain software on their EKS clusters after removing it from EKS add-ons management.",
+    "type": "api-change"
+  },
+  {
+    "category": "``comprehend``",
+    "description": "[``botocore``] Add tagging support for Comprehend async inference job.",
+    "type": "api-change"
+  },
+  {
+    "category": "``robomaker``",
+    "description": "[``botocore``] Documentation updates for RoboMaker",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "[``botocore``] encryptionInTransitSupported added to DescribeInstanceTypes API",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.18.26
+=======
+
+* api-change:``eks``: [``botocore``] Adds support for EKS add-ons "preserve" flag, which allows customers to maintain software on their EKS clusters after removing it from EKS add-ons management.
+* api-change:``comprehend``: [``botocore``] Add tagging support for Comprehend async inference job.
+* api-change:``robomaker``: [``botocore``] Documentation updates for RoboMaker
+* api-change:``ec2``: [``botocore``] encryptionInTransitSupported added to DescribeInstanceTypes API
+
+
 1.18.25
 =======
 
diff --git a/boto3/__init__.py b/boto3/__init__.py
@@ -18,7 +18,7 @@
 
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.18.25'
+__version__ = '1.18.26'
 
 
 # The default Boto3 session; autoloaded when needed.
diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-    botocore>=1.21.25,<1.22.0
+    botocore>=1.21.26,<1.22.0
     jmespath>=0.7.1,<1.0.0
     s3transfer>=0.5.0,<0.6.0
 
diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 
 
 requires = [
-    'botocore>=1.21.25,<1.22.0',
+    'botocore>=1.21.26,<1.22.0',
     'jmespath>=0.7.1,<1.0.0',
     's3transfer>=0.5.0,<0.6.0'
 ]

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`
`16`	`16`	`requires = [`
`17`		`- 'botocore>=1.21.25,<1.22.0',`
	`17`	`+ 'botocore>=1.21.26,<1.22.0',`
`18`	`18`	`'jmespath>=0.7.1,<1.0.0',`
`19`	`19`	`'s3transfer>=0.5.0,<0.6.0'`
`20`	`20`	`]`