From ebf7cb679c793b6c530008a2c78406a121e7c14f Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 20 Jul 2023 12:06:27 +0100 Subject: [PATCH 1/2] Fix building the PyYAML wheel with new versions of Cython See https://github.com/yaml/pyyaml/issues/601 for all the gory details, but we can avoid all the pain by just upgrading the required version. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 28bbc5d..46b4fa9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ click>=7 rzpipe==0.4.0 -pyyaml~=5.4.1 +pyyaml~=6.0.1 shared_memory38; python_version >= "3.6" and python_version < "3.8" uefi_firmware @ git+https://github.com/theopolis/uefi-firmware-parser@v1.10 From eb5399d078b9f338aa403324ca07b0a070865d03 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 20 Jul 2023 12:03:12 +0100 Subject: [PATCH 2/2] trivial: Fix one E713 test for membership --- fwhunt_scan_analyzer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fwhunt_scan_analyzer.py b/fwhunt_scan_analyzer.py index 8692a45..d7eefb4 100644 --- a/fwhunt_scan_analyzer.py +++ b/fwhunt_scan_analyzer.py @@ -151,7 +151,7 @@ def scan_firmware(image_path: str, rule: List[str], rules_dir: str) -> bool: continue for guid in [g.lower() for g in uefi_rule.volume_guids]: lower_guid = guid.lower() - if not lower_guid in rules_guids: + if lower_guid not in rules_guids: rules_guids[lower_guid] = list() rules_guids[lower_guid].append(uefi_rule)