Merge branch 'release-1.25.7'

aws-sdk-python-automation · aws-sdk-python-automation · commit a2b8346a29c0 · 2022-06-10T18:37:17.000Z
* release-1.25.7: Bumping version to 1.25.7 Update changelog based on model updates Update helptext.py to remove visible markup tags (#7023)
diff --git a/.changes/1.25.7.json b/.changes/1.25.7.json
@@ -0,0 +1,7 @@
+[
+  {
+    "category": "``frauddetector``",
+    "description": "Documentation updates for Amazon Fraud Detector (AWSHawksNest)",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+1.25.7
+======
+
+* api-change:``frauddetector``: Documentation updates for Amazon Fraud Detector (AWSHawksNest)
+
+
 1.25.6
 ======
 
diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.25.6'
+__version__ = '1.25.7'
 
 #
 # Get our data path to be added to botocore's search path
diff --git a/awscli/customizations/emr/helptext.py b/awscli/customizations/emr/helptext.py
@@ -48,25 +48,23 @@
 # create-cluster options help text
 
 CREATE_CLUSTER_DESCRIPTION = (
-    '<p>Creates an Amazon EMR cluster with the specified configurations.</p>'
-    '<p>Quick start:</p>'
-    '<p><code>aws emr create-cluster --release-label <release-label>'
-    ' --instance-type <instance-type> --instance-count <instance-count></code></p>'
-    '<p>Values for the following can be set in the AWS CLI'
-    ' config file using the <code>aws configure set</code> command: <code>--service-role, --log-uri,'
-    ' and InstanceProfile and KeyName arguments under --ec2-attributes</code>.</p>')
+    'Creates an Amazon EMR cluster with the specified configurations. '
+    'Quick start: '
+    'aws emr create-cluster --release-label <release-label> '
+    '--instance-type <instance-type> --instance-count <instance-count>'
+    'Values for the following can be set in the AWS CLI. '
+    'config file using the <code>aws configure set</code> command: <code>--service-role, --log-uri, '
+    'and InstanceProfile and KeyName arguments under --ec2-attributes.')
 
 DESCRIBE_CLUSTER_DESCRIPTION = (
-    '<p>Provides  cluster-level details including status, hardware'
-    ' and software configuration, VPC settings, bootstrap'
-    ' actions, instance groups and so on.</p>'
-    '<p>Permissions needed for describe-cluster include:'
-    '<ul><li><code>elasticmapreduce:ListBootstrapActions</code></li>'
-    '<li><code>elasticmapreduce:ListInstanceFleets</code></li>'
-    '<li><code>elasticmapreduce:DescribeCluster</code></li>'
-    '<li><code>elasticmapreduce:ListInstanceGroups</code></li></ul>'
-    'For information about the cluster'
-    ' steps, see <code>list-steps</code>.</p>')
+    'Provides  cluster-level details including status, hardware '
+    'and software configuration, VPC settings, bootstrap '
+    'actions, instance groups and so on. '
+    'Permissions needed for describe-cluster include '
+    'elasticmapreduce:ListBootstrapActions, '
+    'elasticmapreduce:ListInstanceFleets, '
+    'elasticmapreduce:DescribeCluster, '
+    'and elasticmapreduce:ListInstanceGroups.')
 
 CLUSTER_NAME = (
     '<p>The name of the cluster. If not provided, the default is "Development Cluster".</p>')
diff --git a/awscli/examples/emr/create-cluster-examples.rst b/awscli/examples/emr/create-cluster-examples.rst
@@ -293,7 +293,7 @@ The following example uses a JSON file, ``instancegroupconfig.json``, to specify
         --release-label emr-5.9.0 \
         --service-role EMR_DefaultRole \
         --ec2-attributes InstanceProfile=EMR_EC2_DefaultRole \
-        --instance-groups s3://mybucket/instancegroupconfig.json \
+        --instance-groups file://myfolder/instancegroupconfig.json \
         --auto-scaling-role EMR_AutoScaling_DefaultRole
 
 Contents of ``instancegroupconfig.json``::
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.25'
 # The full version, including alpha/beta/rc tags.
-release = '1.25.6'
+release = '1.25.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-        botocore==1.27.6
+        botocore==1.27.7
         docutils>=0.10,<0.17
         s3transfer>=0.6.0,<0.7.0
         PyYAML>=3.10,<5.5
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.27.6',
+    'botocore==1.27.7',
     'docutils>=0.10,<0.17',
     's3transfer>=0.6.0,<0.7.0',
     'PyYAML>=3.10,<5.5',

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"""`
`18`	`18`	`import os`
`19`	`19`
`20`		`-__version__ = '1.25.6'`
	`20`	`+__version__ = '1.25.7'`
`21`	`21`
`22`	`22`	`#`
`23`	`23`	`# Get our data path to be added to botocore's search path`