From 4cef9b13cb6ee69ecd78dfef4f60f507107c1aa0 Mon Sep 17 00:00:00 2001 From: Henri Rosten Date: Mon, 25 Mar 2024 15:44:09 +0200 Subject: [PATCH] Flake update Signed-off-by: Henri Rosten --- flake.lock | 6 +++--- src/common/utils.py | 2 +- src/nixgraph/graph.py | 2 +- src/nixmeta/scanner.py | 2 -- src/nixupdate/nix_outdated.py | 2 -- src/repology/repology_cli.py | 1 - src/repology/repology_cve.py | 2 +- src/sbomnix/cpe.py | 2 +- src/sbomnix/meta.py | 2 +- src/sbomnix/sbomdb.py | 2 +- src/vulnxscan/vulnxscan_cli.py | 5 +++-- tests/compare_deps.py | 2 +- tests/compare_sboms.py | 2 -- tests/test_sbomnix.py | 2 +- 14 files changed, 14 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 8dce92c..cd6397c 100644 --- a/flake.lock +++ b/flake.lock @@ -67,11 +67,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { diff --git a/src/common/utils.py b/src/common/utils.py index d468e9c..cfa9189 100644 --- a/src/common/utils.py +++ b/src/common/utils.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -# pylint: disable=invalid-name, abstract-method +# pylint: disable=abstract-method """ sbomnix utils """ diff --git a/src/nixgraph/graph.py b/src/nixgraph/graph.py index 718ba29..06a3316 100644 --- a/src/nixgraph/graph.py +++ b/src/nixgraph/graph.py @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: Apache-2.0 -# pylint: disable=too-few-public-methods, invalid-name +# pylint: disable=too-few-public-methods # pylint: disable=too-many-instance-attributes """ Python script to query and visualize nix package dependencies """ diff --git a/src/nixmeta/scanner.py b/src/nixmeta/scanner.py index 84d8304..8dbc4b2 100755 --- a/src/nixmeta/scanner.py +++ b/src/nixmeta/scanner.py @@ -3,8 +3,6 @@ # SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII) # SPDX-License-Identifier: Apache-2.0 -# pylint: disable=invalid-name - """ Summarize nixpkgs meta-attributes """ import re diff --git a/src/nixupdate/nix_outdated.py b/src/nixupdate/nix_outdated.py index b441734..064ce6a 100755 --- a/src/nixupdate/nix_outdated.py +++ b/src/nixupdate/nix_outdated.py @@ -4,8 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -# pylint: disable=invalid-name - """ Command-line tool to list outdated nix dependencies in priority order""" import logging diff --git a/src/repology/repology_cli.py b/src/repology/repology_cli.py index 525376a..1e5b938 100755 --- a/src/repology/repology_cli.py +++ b/src/repology/repology_cli.py @@ -4,7 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -# pylint: disable=invalid-name # pylint: disable=too-few-public-methods, too-many-statements # pylint: disable=too-many-instance-attributes, too-many-locals diff --git a/src/repology/repology_cve.py b/src/repology/repology_cve.py index f629921..03f663a 100755 --- a/src/repology/repology_cve.py +++ b/src/repology/repology_cve.py @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: Apache-2.0 -# pylint: disable=invalid-name too-many-locals +# pylint: disable=too-many-locals """ Command-line interface to query CVE info from repology.org """ diff --git a/src/sbomnix/cpe.py b/src/sbomnix/cpe.py index 7c26516..e6b33cf 100644 --- a/src/sbomnix/cpe.py +++ b/src/sbomnix/cpe.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -# pylint: disable=invalid-name, too-few-public-methods +# pylint: disable=too-few-public-methods """ Generate CPE (Common Platform Enumeration) identifiers""" diff --git a/src/sbomnix/meta.py b/src/sbomnix/meta.py index 869a38b..5853adb 100644 --- a/src/sbomnix/meta.py +++ b/src/sbomnix/meta.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -# pylint: disable=too-few-public-methods, invalid-name +# pylint: disable=too-few-public-methods """Cache nixpkgs meta information""" diff --git a/src/sbomnix/sbomdb.py b/src/sbomnix/sbomdb.py index dfa0afe..08953ac 100644 --- a/src/sbomnix/sbomdb.py +++ b/src/sbomnix/sbomdb.py @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: Apache-2.0 -# pylint: disable=invalid-name, too-many-instance-attributes, too-many-arguments +# pylint: disable=too-many-instance-attributes, too-many-arguments """ Module for generating SBOMs in various formats """ diff --git a/src/vulnxscan/vulnxscan_cli.py b/src/vulnxscan/vulnxscan_cli.py index 0916e92..9ead4e2 100755 --- a/src/vulnxscan/vulnxscan_cli.py +++ b/src/vulnxscan/vulnxscan_cli.py @@ -4,7 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -# pylint: disable=invalid-name # pylint: disable=too-many-return-statements """ @@ -786,7 +785,9 @@ def load_whitelist(whitelist_csv_path): # Interpret possible string values in "whitelist" column # to boolean as follows: df["whitelist"] = df["whitelist"].replace({"": True}) - df["whitelist"] = df["whitelist"].replace({"False": False, "0": False}) + df["whitelist"] = ( + df["whitelist"].astype(str).replace({"False": False, "0": False}) + ) df["whitelist"] = df["whitelist"].astype("bool") return df diff --git a/tests/compare_deps.py b/tests/compare_deps.py index a6daf53..138b99a 100755 --- a/tests/compare_deps.py +++ b/tests/compare_deps.py @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: Apache-2.0 -# pylint: disable=invalid-name, too-many-locals +# pylint: disable=too-many-locals """ Python script that compares dependencies between sbomnix and nixgraph """ diff --git a/tests/compare_sboms.py b/tests/compare_sboms.py index ecbf47f..65f3f26 100755 --- a/tests/compare_sboms.py +++ b/tests/compare_sboms.py @@ -4,8 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -# pylint: disable=invalid-name - """ Python script that compares two sboms """ import argparse diff --git a/tests/test_sbomnix.py b/tests/test_sbomnix.py index d7d0048..19add89 100644 --- a/tests/test_sbomnix.py +++ b/tests/test_sbomnix.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 -# pylint: disable=invalid-name, global-statement, redefined-outer-name +# pylint: disable=global-statement, redefined-outer-name # pylint: disable=too-few-public-methods """Tests for sbomnix"""