From b9cba08075aaf5002155b9b86739f09db35e9946 Mon Sep 17 00:00:00 2001 From: Guillaume Fieni Date: Wed, 19 Feb 2025 12:26:03 +0100 Subject: [PATCH 1/2] refactor(report): Remove usage of printf string formatting --- src/powerapi/report/control_report.py | 2 +- src/powerapi/report/hwpc_report.py | 3 +-- src/powerapi/report/power_report.py | 3 +-- src/powerapi/report/procfs_report.py | 2 +- src/powerapi/report/report.py | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/powerapi/report/control_report.py b/src/powerapi/report/control_report.py index e697cb18..95f2002a 100644 --- a/src/powerapi/report/control_report.py +++ b/src/powerapi/report/control_report.py @@ -55,7 +55,7 @@ def __init__(self, timestamp: datetime, sensor: str, target: str, action: str, p self.parameters = parameters def __repr__(self) -> str: - return 'ControlReport(%s, %s, %s, %s, %s, %s)' % (self.timestamp, self.sensor, self.target, self.action, self.parameters, str(self.metadata)) + return f'ControlReport({self.timestamp}, {self.sensor}, {self.target}, {self.action}, {self.parameters}, {self.metadata})' def __eq__(self, other: Any) -> bool: if not isinstance(other, ControlReport): diff --git a/src/powerapi/report/hwpc_report.py b/src/powerapi/report/hwpc_report.py index 2a542fb2..265b74f8 100644 --- a/src/powerapi/report/hwpc_report.py +++ b/src/powerapi/report/hwpc_report.py @@ -84,8 +84,7 @@ def __init__(self, timestamp: datetime, sensor: str, target: str, groups: dict[s self.groups = groups def __repr__(self) -> str: - return 'HWCPReport(%s, %s, %s, %s)' % ( - self.timestamp, self.sensor, self.target, sorted(self.groups.keys())) + return f'HWPCReport({self.timestamp}, {self.sensor}, {self.target}, {sorted(self.groups.keys())}, {self.metadata})' def __eq__(self, other) -> bool: if not isinstance(other, HWPCReport): diff --git a/src/powerapi/report/power_report.py b/src/powerapi/report/power_report.py index f1f2a16b..2c2a751f 100644 --- a/src/powerapi/report/power_report.py +++ b/src/powerapi/report/power_report.py @@ -56,8 +56,7 @@ def __init__(self, timestamp: datetime, sensor: str, target: str, power: float, self.power = power def __repr__(self) -> str: - return 'PowerReport(%s, %s, %s, %f, %s)' % ( - self.timestamp, self.sensor, self.target, self.power, str(self.metadata)) + return f'PowerReport({self.timestamp}, {self.sensor}, {self.target}, {self.power}, {self.metadata})' def __eq__(self, other) -> bool: if not isinstance(other, PowerReport): diff --git a/src/powerapi/report/procfs_report.py b/src/powerapi/report/procfs_report.py index 4a5338e0..e6028c57 100644 --- a/src/powerapi/report/procfs_report.py +++ b/src/powerapi/report/procfs_report.py @@ -69,7 +69,7 @@ def __init__(self, timestamp: datetime, sensor: str, target: str, usage: dict, g self.global_cpu_usage = global_cpu_usage def __repr__(self) -> str: - return 'ProcfsReport(%s, %s, %s, %s, %s)' % (self.timestamp, self.sensor, self.target, sorted(self.usage.keys()), str(self.metadata)) + return f'ProcfsReport({self.timestamp}, {self.sensor}, {self.target}, {sorted(self.usage.keys())}, {self.metadata})' def __eq__(self, other) -> bool: if not isinstance(other, ProcfsReport): diff --git a/src/powerapi/report/report.py b/src/powerapi/report/report.py index cf2ca87e..cd65d129 100644 --- a/src/powerapi/report/report.py +++ b/src/powerapi/report/report.py @@ -88,10 +88,10 @@ def __init__(self, timestamp: datetime, sensor: str, target: str, metadata: dict self.dispatcher_report_id = None def __str__(self): - return '%s(%s, %s, %s)' % (self.__class__.__name__, self.timestamp, self.sensor, self.target) + return f'{self.__class__.__name__}({self.timestamp}, {self.sensor}, {self.target}, {self.metadata})' def __repr__(self): - return '%s(%s, %s, %s)' % (self.__class__.__name__, self.timestamp, self.sensor, self.target) + return f'{self.__class__.__name__}({self.timestamp}, {self.sensor}, {self.target}, {self.metadata})' def __eq__(self, other): return (isinstance(other, type(self)) and From 8c6a5c2d04e5b3545273a1a7459e5d7a13969f3b Mon Sep 17 00:00:00 2001 From: Guillaume Fieni Date: Wed, 19 Feb 2025 12:26:43 +0100 Subject: [PATCH 2/2] build(ruff): Remove `printf-string-formatting` from ignored rules list --- .ruff.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/.ruff.toml b/.ruff.toml index 9c0e1e78..f67c7402 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -16,7 +16,6 @@ select = [ ignore = [ "E501", # line too long - "UP031", # printf-string-formatting "UP035", # deprecated-import "B006", # mutable-argument-default "B008", # function-call-in-default-argument