diff --git a/.changes/1.34.0.json b/.changes/1.34.0.json
new file mode 100644
index 0000000000..05b2393010
--- /dev/null
+++ b/.changes/1.34.0.json
@@ -0,0 +1,12 @@
+[
+ {
+ "category": "Python",
+ "description": "End of support for Python 3.7",
+ "type": "feature"
+ },
+ {
+ "category": "``drs``",
+ "description": "Adding AgentVersion to SourceServer and RecoveryInstance structures",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/feature-Python-21065.json b/.changes/next-release/feature-Python-21065.json
deleted file mode 100644
index c21896b745..0000000000
--- a/.changes/next-release/feature-Python-21065.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "feature",
- "category": "Python",
- "description": "End of support for Python 3.7"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e065ce9bd5..caacc75984 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@
CHANGELOG
=========
+1.34.0
+======
+
+* feature:Python: End of support for Python 3.7
+* api-change:``drs``: Adding AgentVersion to SourceServer and RecoveryInstance structures
+
+
1.33.13
=======
diff --git a/botocore/__init__.py b/botocore/__init__.py
index 272e37d542..dc249a5762 100644
--- a/botocore/__init__.py
+++ b/botocore/__init__.py
@@ -16,7 +16,7 @@
import os
import re
-__version__ = '1.33.13'
+__version__ = '1.34.0'
class NullHandler(logging.Handler):
diff --git a/botocore/data/drs/2020-02-26/endpoint-rule-set-1.json b/botocore/data/drs/2020-02-26/endpoint-rule-set-1.json
index 28091fefce..7a53d04f4c 100644
--- a/botocore/data/drs/2020-02-26/endpoint-rule-set-1.json
+++ b/botocore/data/drs/2020-02-26/endpoint-rule-set-1.json
@@ -40,7 +40,6 @@
]
}
],
- "type": "tree",
"rules": [
{
"conditions": [
@@ -83,7 +82,8 @@
},
"type": "endpoint"
}
- ]
+ ],
+ "type": "tree"
},
{
"conditions": [
@@ -96,7 +96,6 @@
]
}
],
- "type": "tree",
"rules": [
{
"conditions": [
@@ -110,7 +109,6 @@
"assign": "PartitionResult"
}
],
- "type": "tree",
"rules": [
{
"conditions": [
@@ -133,7 +131,6 @@
]
}
],
- "type": "tree",
"rules": [
{
"conditions": [
@@ -168,7 +165,6 @@
]
}
],
- "type": "tree",
"rules": [
{
"conditions": [],
@@ -179,14 +175,16 @@
},
"type": "endpoint"
}
- ]
+ ],
+ "type": "tree"
},
{
"conditions": [],
"error": "FIPS and DualStack are enabled, but this partition does not support one or both",
"type": "error"
}
- ]
+ ],
+ "type": "tree"
},
{
"conditions": [
@@ -200,14 +198,12 @@
]
}
],
- "type": "tree",
"rules": [
{
"conditions": [
{
"fn": "booleanEquals",
"argv": [
- true,
{
"fn": "getAttr",
"argv": [
@@ -216,11 +212,11 @@
},
"supportsFIPS"
]
- }
+ },
+ true
]
}
],
- "type": "tree",
"rules": [
{
"conditions": [],
@@ -231,14 +227,16 @@
},
"type": "endpoint"
}
- ]
+ ],
+ "type": "tree"
},
{
"conditions": [],
"error": "FIPS is enabled but this partition does not support FIPS",
"type": "error"
}
- ]
+ ],
+ "type": "tree"
},
{
"conditions": [
@@ -252,7 +250,6 @@
]
}
],
- "type": "tree",
"rules": [
{
"conditions": [
@@ -272,7 +269,6 @@
]
}
],
- "type": "tree",
"rules": [
{
"conditions": [],
@@ -283,14 +279,16 @@
},
"type": "endpoint"
}
- ]
+ ],
+ "type": "tree"
},
{
"conditions": [],
"error": "DualStack is enabled but this partition does not support DualStack",
"type": "error"
}
- ]
+ ],
+ "type": "tree"
},
{
"conditions": [],
@@ -301,9 +299,11 @@
},
"type": "endpoint"
}
- ]
+ ],
+ "type": "tree"
}
- ]
+ ],
+ "type": "tree"
},
{
"conditions": [],
diff --git a/botocore/data/drs/2020-02-26/service-2.json b/botocore/data/drs/2020-02-26/service-2.json
index f8004c29d6..80032f9f93 100644
--- a/botocore/data/drs/2020-02-26/service-2.json
+++ b/botocore/data/drs/2020-02-26/service-2.json
@@ -979,6 +979,10 @@
"max":50,
"min":0
},
+ "AgentVersion":{
+ "type":"string",
+ "pattern":"^[0-9]{1,5}.[0-9]{1,5}.[0-9]{1,5}(.[0-9]{4}.[0-9]{3}.[0-9]{4})?$"
+ },
"AssociateSourceNetworkStackRequest":{
"type":"structure",
"required":[
@@ -3157,6 +3161,10 @@
"RecoveryInstance":{
"type":"structure",
"members":{
+ "agentVersion":{
+ "shape":"AgentVersion",
+ "documentation":"The version of the DRS agent installed on the recovery instance
"
+ },
"arn":{
"shape":"ARN",
"documentation":"The ARN of the Recovery Instance.
"
@@ -4079,6 +4087,10 @@
"SourceServer":{
"type":"structure",
"members":{
+ "agentVersion":{
+ "shape":"AgentVersion",
+ "documentation":"The version of the DRS agent installed on the source server
"
+ },
"arn":{
"shape":"ARN",
"documentation":"The ARN of the Source Server.
"
diff --git a/botocore/data/endpoints.json b/botocore/data/endpoints.json
index b91dfc0544..e100270b5e 100644
--- a/botocore/data/endpoints.json
+++ b/botocore/data/endpoints.json
@@ -6843,6 +6843,7 @@
"deprecated" : true,
"hostname" : "emr-serverless-fips.us-west-2.amazonaws.com"
},
+ "me-central-1" : { },
"me-south-1" : { },
"sa-east-1" : { },
"us-east-1" : {
@@ -20285,6 +20286,12 @@
"cn-northwest-1" : { }
}
},
+ "pipes" : {
+ "endpoints" : {
+ "cn-north-1" : { },
+ "cn-northwest-1" : { }
+ }
+ },
"polly" : {
"endpoints" : {
"cn-northwest-1" : { }
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 61a718c225..45ee9628a7 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -57,9 +57,9 @@
# built documents.
#
# The short X.Y version.
-version = '1.33.'
+version = '1.34'
# The full version, including alpha/beta/rc tags.
-release = '1.33.13'
+release = '1.34.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.