Merge branch 'release-1.24.9'

* release-1.24.9: Bumping version to 1.24.9 Update changelog based on model updates delete 'instance_type_config_keys' variable delete 'ec2_instance_attr' variable delete 'ec2_instance_attr_keys' variable delete unused variable delete 'name' variable
aws · May 26, 2022 · 7f04197 · 7f04197
2 parents bbf7378 + 4c24413
commit 7f04197
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 17 deletions.
diff --git a/.changes/1.24.9.json b/.changes/1.24.9.json
@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``ec2``",
+    "description": "C7g instances, powered by the latest generation AWS Graviton3 processors, provide the best price performance in Amazon EC2 for compute-intensive workloads.",
+    "type": "api-change"
+  },
+  {
+    "category": "``emr-serverless``",
+    "description": "This release adds support for Amazon EMR Serverless, a serverless runtime environment that simplifies running analytics applications using the latest open source frameworks such as Apache Spark and Apache Hive.",
+    "type": "api-change"
+  },
+  {
+    "category": "``forecast``",
+    "description": "Introduced a new field in Auto Predictor as Time Alignment Boundary. It helps in aligning the timestamps generated during Forecast exports",
+    "type": "api-change"
+  },
+  {
+    "category": "``lightsail``",
+    "description": "Amazon Lightsail now supports the ability to configure a Lightsail Container Service to pull images from Amazon ECR private repositories in your account.",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.24.9
+======
+
+* api-change:``ec2``: C7g instances, powered by the latest generation AWS Graviton3 processors, provide the best price performance in Amazon EC2 for compute-intensive workloads.
+* api-change:``emr-serverless``: This release adds support for Amazon EMR Serverless, a serverless runtime environment that simplifies running analytics applications using the latest open source frameworks such as Apache Spark and Apache Hive.
+* api-change:``forecast``: Introduced a new field in Auto Predictor as Time Alignment Boundary. It helps in aligning the timestamps generated during Forecast exports
+* api-change:``lightsail``: Amazon Lightsail now supports the ability to configure a Lightsail Container Service to pull images from Amazon ECR private repositories in your account.
+
+
 1.24.8
 ======
 

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.24.8'
+__version__ = '1.24.9'
 
 #
 # Get our data path to be added to botocore's search path

diff --git a/awscli/clidocs.py b/awscli/clidocs.py
@@ -38,7 +38,7 @@ def __init__(self, help_command):
 
     def _build_arg_table_groups(self, help_command):
         arg_groups = {}
-        for name, arg in help_command.arg_table.items():
+        for arg in help_command.arg_table.values():
             if arg.group_name is not None:
                 arg_groups.setdefault(arg.group_name, []).append(arg)
         return arg_groups

diff --git a/awscli/customizations/emr/describecluster.py b/awscli/customizations/emr/describecluster.py
@@ -42,14 +42,6 @@ def _run_main_command(self, parsed_args, parsed_globals):
             if describe_cluster.get('InstanceCollectionType') == constants.INSTANCE_FLEET_TYPE:
                 is_fleet_based_cluster = True
 
-            if 'Ec2InstanceAttributes' in describe_cluster:
-                ec2_instance_attr_keys = \
-                    describe_cluster['Ec2InstanceAttributes'].keys()
-                ec2_instance_attr = \
-                    describe_cluster['Ec2InstanceAttributes']
-        else:
-            ec2_instance_attr_keys = {}
-
         if is_fleet_based_cluster:
             list_instance_fleets_result = self._call(
                 self._session, 'list_instance_fleets', parameters,

diff --git a/awscli/customizations/emr/instancefleetsutils.py b/awscli/customizations/emr/instancefleetsutils.py
@@ -40,9 +40,6 @@ def validate_and_build_instance_fleets(parsed_instance_fleets):
             instance_fleet_config['TargetSpotCapacity'] = instance_fleet['TargetSpotCapacity']
 
         if 'InstanceTypeConfigs' in keys:
-            if 'TargetSpotCapacity' in keys:
-                for instance_type_config in instance_fleet['InstanceTypeConfigs']:
-                    instance_type_config_keys = instance_type_config.keys()
             instance_fleet_config['InstanceTypeConfigs'] = instance_fleet['InstanceTypeConfigs']
 
         if 'LaunchSpecifications' in keys:

diff --git a/awscli/customizations/toplevelbool.py b/awscli/customizations/toplevelbool.py
@@ -57,7 +57,7 @@ def pull_up_bool(argument_table, event_handler, **kwargs):
         'operation-args-parsed.ec2.*',
         partial(validate_boolean_mutex_groups,
                 boolean_pairs=boolean_pairs))
-    for key, value in list(argument_table.items()):
+    for value in list(argument_table.values()):
         if hasattr(value, 'argument_model'):
             arg_model = value.argument_model
             if _qualifies_for_simplification(arg_model):

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.24'
 # The full version, including alpha/beta/rc tags.
-release = '1.24.8'
+release = '1.24.9'
 
 # 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.26.8
+        botocore==1.26.9
         docutils>=0.10,<0.17
         s3transfer>=0.5.0,<0.6.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.26.8',
+    'botocore==1.26.9',
     'docutils>=0.10,<0.17',
     's3transfer>=0.5.0,<0.6.0',
     'PyYAML>=3.10,<5.5',