diff --git a/scripts/.sourcery.yaml b/scripts/.sourcery.yaml index 946b79832f18d954415b7999425b0f5bbbaac176..059da1da65c69efda551da930efc672b7855da72 100644 --- a/scripts/.sourcery.yaml +++ b/scripts/.sourcery.yaml @@ -28,7 +28,6 @@ rule_settings: - raise-specific-error - simplify-len-comparison - de-morgan - - merge-nested-ifs - use-named-expression - use-next diff --git a/scripts/analyze_job_logs.py b/scripts/analyze_job_logs.py index 6f6c11f8e6b8870a2a21e38596913d706b367d66..cf4c5f9cd47994bc6ef4bfdf78cb6a36de4e546f 100755 --- a/scripts/analyze_job_logs.py +++ b/scripts/analyze_job_logs.py @@ -94,9 +94,8 @@ def main(args): for job in job_it: if options.filter_status is not None and job.status != options.filter_status: continue - if options.filter_tag is not None: - if not options.filter_tag in job.tag_list: - continue + if options.filter_tag is not None and not options.filter_tag in job.tag_list: + continue log = bytes.decode(job.trace()) if options.pattern in log: logging.debug( diff --git a/scripts/delete_job_artifacts.py b/scripts/delete_job_artifacts.py index 67804bbc975663c864def89bc9d26a547b2985b8..4c160f30323b9d907e7020545c179d1dab3de24a 100755 --- a/scripts/delete_job_artifacts.py +++ b/scripts/delete_job_artifacts.py @@ -87,9 +87,8 @@ def main(args): continue if options.filter_status is not None and job.status != options.filter_status: continue - if options.filter_tag is not None: - if not options.filter_tag in job.tag_list: - continue + if options.filter_tag is not None and not options.filter_tag in job.tag_list: + continue job.delete_artifacts() logging.debug( "Deleted artifacts for %s: %s %s.", diff --git a/scripts/lava_api.py b/scripts/lava_api.py index dc8d35d0e099520df32cfbed14482c56d9d1ea51..100e41b1fb232fded82bfdffaaf45814f1c81674 100755 --- a/scripts/lava_api.py +++ b/scripts/lava_api.py @@ -387,9 +387,8 @@ class LavaJob: self.machine = re.sub(r"\d", "", self.device) self.device_type = self._jobdetails["requested_device_type"] - if device_list is not None: - if self.device in device_list: - self.device = device_list[self.device] + if device_list is not None and self.device in device_list: + self.device = device_list[self.device] self.ok = ( self._jobdetails["state"] == "Finished"