Merge branch 'release-1.18.60'

aws-sdk-python-automation · aws-sdk-python-automation · commit ef35d5d4a8d6 · 2021-10-12T18:07:21.000Z
* release-1.18.60: Bumping version to 1.18.60 Add changelog entries from botocore Move from 3.10-dev to 3.10 (#3036) Update documentation cookie preferences (#3035)
diff --git a/.changes/1.18.60.json b/.changes/1.18.60.json
@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``cloudsearch``",
+    "description": "[``botocore``] Adds an additional validation exception for Amazon CloudSearch configuration APIs for better error handling.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ecs``",
+    "description": "[``botocore``] Documentation only update to address tickets.",
+    "type": "api-change"
+  },
+  {
+    "category": "``mediatailor``",
+    "description": "[``botocore``] MediaTailor now supports ad prefetching.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "[``botocore``] EncryptionSupport for InstanceStorageInfo added to DescribeInstanceTypes API",
+    "type": "api-change"
+  }
+]
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, 3.10-dev]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
         os: [ubuntu-latest, macOS-latest, windows-latest ]
 
     steps:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.18.60
+=======
+
+* api-change:``cloudsearch``: [``botocore``] Adds an additional validation exception for Amazon CloudSearch configuration APIs for better error handling.
+* api-change:``ecs``: [``botocore``] Documentation only update to address tickets.
+* api-change:``mediatailor``: [``botocore``] MediaTailor now supports ad prefetching.
+* api-change:``ec2``: [``botocore``] EncryptionSupport for InstanceStorageInfo added to DescribeInstanceTypes API
+
+
 1.18.59
 =======
 
diff --git a/boto3/__init__.py b/boto3/__init__.py
@@ -18,7 +18,7 @@
 
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.18.59'
+__version__ = '1.18.60'
 
 
 # The default Boto3 session; autoloaded when needed.
diff --git a/docs/source/_static/shortbreadv1.js b/docs/source/_static/shortbreadv1.js
diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-    botocore>=1.21.59,<1.22.0
+    botocore>=1.21.60,<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
@@ -13,7 +13,7 @@
 
 
 requires = [
-    'botocore>=1.21.59,<1.22.0',
+    'botocore>=1.21.60,<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
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`
`15`	`15`	`requires = [`
`16`		`- 'botocore>=1.21.59,<1.22.0',`
	`16`	`+ 'botocore>=1.21.60,<1.22.0',`
`17`	`17`	`'jmespath>=0.7.1,<1.0.0',`
`18`	`18`	`'s3transfer>=0.5.0,<0.6.0'`
`19`	`19`	`]`