Merge branch 'release-1.18.31' into develop

* release-1.18.31: Bumping version to 1.18.31 Add changelog entries from botocore
boto · Aug 27, 2021 · 64ed0b1 · 64ed0b1
2 parents 42319f5 + 95549f4
commit 64ed0b1
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/.changes/1.18.31.json b/.changes/1.18.31.json
@@ -0,0 +1,17 @@
+[
+  {
+    "category": "``s3``",
+    "description": "[``botocore``] Documentation updates for Amazon S3.",
+    "type": "api-change"
+  },
+  {
+    "category": "``emr``",
+    "description": "[``botocore``] Update emr client to latest version",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "[``botocore``] This release adds the BootMode flag to the ImportImage API and showing the detected BootMode of an ImportImage task.",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.18.31
+=======
+
+* api-change:``s3``: [``botocore``] Documentation updates for Amazon S3.
+* api-change:``emr``: [``botocore``] Update emr client to latest version
+* api-change:``ec2``: [``botocore``] This release adds the BootMode flag to the ImportImage API and showing the detected BootMode of an ImportImage task.
+
+
 1.18.30
 =======
 

diff --git a/boto3/__init__.py b/boto3/__init__.py
@@ -18,7 +18,7 @@
 
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.18.30'
+__version__ = '1.18.31'
 
 
 # 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.30,<1.22.0
+    botocore>=1.21.31,<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.30,<1.22.0',
+    'botocore>=1.21.31,<1.22.0',
     'jmespath>=0.7.1,<1.0.0',
     's3transfer>=0.5.0,<0.6.0'
 ]