From ac224a67882ba6698d35f511c51785b2cbe3d0d0 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 16 Nov 2024 15:17:45 +0900 Subject: [PATCH] Bump hacking hacking 3.0.x is quite old. Bump it to the latest version. Also remove the note about old pip's behavior because recent pip does not require specific order. Change-Id: I10ba6418dd7adc6a6d0b63e01b4d5c5a95cb44a2 --- doc/requirements.txt | 3 --- requirements.txt | 3 --- test-requirements.txt | 5 +---- troveclient/osc/v1/database_flavors.py | 4 ++-- troveclient/osc/v1/database_logs.py | 4 ++-- troveclient/v1/shell.py | 4 ++-- 6 files changed, 7 insertions(+), 16 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index bba582be..7e98e7f5 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,6 +1,3 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. sphinx>=2.0.0,!=2.1.0 # BSD sphinxcontrib-apidoc>=0.2.0 # BSD reno>=3.1.0 # Apache-2.0 diff --git a/requirements.txt b/requirements.txt index 69f35bdb..8321d6a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,3 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. pbr!=2.1.0,>=2.0.0 # Apache-2.0 PrettyTable>=0.7.2 # BSD requests>=2.14.2 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index f3170af7..92880a8a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,4 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. -hacking>=3.0.1,<3.1.0 # Apache-2.0 +hacking>=7.0.0,<7.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD oslotest>=3.2.0 # Apache-2.0 diff --git a/troveclient/osc/v1/database_flavors.py b/troveclient/osc/v1/database_flavors.py index 016269c9..368d1f1b 100644 --- a/troveclient/osc/v1/database_flavors.py +++ b/troveclient/osc/v1/database_flavors.py @@ -23,12 +23,12 @@ def set_attributes_for_print_detail(flavor): info = flavor._info.copy() # Get rid of those ugly links if info.get('links'): - del(info['links']) + del info['links'] # Fallback to str_id for flavors, where necessary if hasattr(flavor, 'str_id'): info['id'] = flavor.id - del(info['str_id']) + del info['str_id'] return info diff --git a/troveclient/osc/v1/database_logs.py b/troveclient/osc/v1/database_logs.py index a7a1730f..41349ae6 100644 --- a/troveclient/osc/v1/database_logs.py +++ b/troveclient/osc/v1/database_logs.py @@ -37,8 +37,8 @@ class ListDatabaseLogs(command.Lister): instance = osc_utils.find_resource(database_instances, parsed_args.instance) log_list = database_instances.log_list(instance) - logs = [osc_utils.get_item_properties(l, self.columns) - for l in log_list] + logs = [osc_utils.get_item_properties(log, self.columns) + for log in log_list] return self.columns, logs diff --git a/troveclient/v1/shell.py b/troveclient/v1/shell.py index 5716c78c..2a314061 100644 --- a/troveclient/v1/shell.py +++ b/troveclient/v1/shell.py @@ -141,12 +141,12 @@ def _print_cluster(cluster, include_all=False): def _print_object(obj): # Get rid of those ugly links if obj._info.get('links'): - del(obj._info['links']) + del obj._info['links'] # Fallback to str_id for flavors, where necessary if hasattr(obj, 'str_id'): obj._info['id'] = obj.id - del(obj._info['str_id']) + del obj._info['str_id'] # Get datastore type and version, where necessary if hasattr(obj, 'datastore'):