Merge branch 'release-1.20.37' into develop

aws-sdk-python-automation · aws-sdk-python-automation · commit 235a19b65af5 · 2022-01-15T02:09:30.000Z
* release-1.20.37:
  Bumping version to 1.20.37
  Add changelog entries from botocore
diff --git a/.changes/1.20.37.json b/.changes/1.20.37.json
@@ -0,0 +1,7 @@
+[
+  {
+    "category": "Configuration",
+    "description": "[``botocore``] Adding support for `defaults_mode` configuration. The `defaults_mode` will be used to determine how certain default configuration options are resolved in the SDK.",
+    "type": "enhancement"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+1.20.37
+=======
+
+* enhancement:Configuration: [``botocore``] Adding support for `defaults_mode` configuration. The `defaults_mode` will be used to determine how certain default configuration options are resolved in the SDK.
+
+
 1.20.36
 =======
 
diff --git a/boto3/__init__.py b/boto3/__init__.py
@@ -18,7 +18,7 @@
 
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.20.36'
+__version__ = '1.20.37'
 
 
 # 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.23.36,<1.24.0
+    botocore>=1.23.37,<1.24.0
     jmespath>=0.7.1,<1.0.0
     s3transfer>=0.5.0,<0.6.0
 
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 
 requires = [
-    'botocore>=1.23.36,<1.24.0',
+    'botocore>=1.23.37,<1.24.0',
     'jmespath>=0.7.1,<1.0.0',
     's3transfer>=0.5.0,<0.6.0'
 ]
