Merge branch 'release-1.21.21'

* release-1.21.21: Bumping version to 1.21.21 Add changelog entries from botocore Add support for jmespath 1.0 (#3189)
boto · Mar 16, 2022 · f191144 · f191144
2 parents 37a4c83 + 39fefd8
commit f191144
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 6 deletions.
diff --git a/.changes/1.21.21.json b/.changes/1.21.21.json
@@ -0,0 +1,37 @@
+[
+  {
+    "category": "Dependency",
+    "description": "[``botocore``] Added support for jmespath 1.0",
+    "type": "enhancement"
+  },
+  {
+    "category": "``amplifybackend``",
+    "description": "[``botocore``] Adding the ability to customize Cognito verification messages for email and SMS in CreateBackendAuth and UpdateBackendAuth. Adding deprecation documentation for ForgotPassword in CreateBackendAuth and UpdateBackendAuth",
+    "type": "api-change"
+  },
+  {
+    "category": "``acm-pca``",
+    "description": "[``botocore``] AWS Certificate Manager (ACM) Private Certificate Authority (CA) now supports customizable certificate subject names and extensions.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ssm-incidents``",
+    "description": "[``botocore``] Removed incorrect validation pattern for IncidentRecordSource.invokedBy",
+    "type": "api-change"
+  },
+  {
+    "category": "Dependency",
+    "description": "Added support for jmespath 1.0",
+    "type": "enhancement"
+  },
+  {
+    "category": "``billingconductor``",
+    "description": "[``botocore``] This is the initial SDK release for AWS Billing Conductor. The AWS Billing Conductor is a customizable billing service, allowing you to customize your billing data to match your desired business structure.",
+    "type": "api-change"
+  },
+  {
+    "category": "``s3outposts``",
+    "description": "[``botocore``] S3 on Outposts is releasing a new API, ListSharedEndpoints, that lists all endpoints associated with S3 on Outpost, that has been shared by Resource Access Manager (RAM).",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,18 @@
 CHANGELOG
 =========
 
+1.21.21
+=======
+
+* enhancement:Dependency: [``botocore``] Added support for jmespath 1.0
+* api-change:``amplifybackend``: [``botocore``] Adding the ability to customize Cognito verification messages for email and SMS in CreateBackendAuth and UpdateBackendAuth. Adding deprecation documentation for ForgotPassword in CreateBackendAuth and UpdateBackendAuth
+* api-change:``acm-pca``: [``botocore``] AWS Certificate Manager (ACM) Private Certificate Authority (CA) now supports customizable certificate subject names and extensions.
+* api-change:``ssm-incidents``: [``botocore``] Removed incorrect validation pattern for IncidentRecordSource.invokedBy
+* enhancement:Dependency: Added support for jmespath 1.0
+* api-change:``billingconductor``: [``botocore``] This is the initial SDK release for AWS Billing Conductor. The AWS Billing Conductor is a customizable billing service, allowing you to customize your billing data to match your desired business structure.
+* api-change:``s3outposts``: [``botocore``] S3 on Outposts is releasing a new API, ListSharedEndpoints, that lists all endpoints associated with S3 on Outpost, that has been shared by Resource Access Manager (RAM).
+
+
 1.21.20
 =======
 

diff --git a/boto3/__init__.py b/boto3/__init__.py
@@ -17,7 +17,7 @@
 from boto3.session import Session
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.21.20'
+__version__ = '1.21.21'
 
 
 # The default Boto3 session; autoloaded when needed.

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
 -e git+https://github.com/boto/botocore.git@develop#egg=botocore
--e git+https://github.com/boto/jmespath.git@develop#egg=jmespath
+-e 'git+https://github.com/boto/jmespath.git@develop#egg=jmespath; python_version > "3.6"'
+jmespath<1.0; python_version <= '3.6'
 -e git+https://github.com/boto/s3transfer.git@develop#egg=s3transfer
diff --git a/setup.cfg b/setup.cfg
@@ -3,8 +3,8 @@ universal = 0
 
 [metadata]
 requires_dist =
-    botocore>=1.24.20,<1.25.0
-    jmespath>=0.7.1,<1.0.0
+    botocore>=1.24.21,<1.25.0
+    jmespath>=0.7.1,<2.0.0
     s3transfer>=0.5.0,<0.6.0
 
 [options.extras_require]

diff --git a/setup.py b/setup.py
@@ -13,8 +13,8 @@
 
 
 requires = [
-    'botocore>=1.24.20,<1.25.0',
-    'jmespath>=0.7.1,<1.0.0',
+    'botocore>=1.24.21,<1.25.0',
+    'jmespath>=0.7.1,<2.0.0',
     's3transfer>=0.5.0,<0.6.0',
 ]