Merge pull request #201195 from amarshall/checkov-fix
checkov: Fix build
This commit is contained in:
@@ -42,6 +42,10 @@ buildPythonApplication rec {
|
||||
hash = "sha256-dXpgm9S++jtBhuzX9db8Pm5LF6Qb4isXx5uyOGdWGUc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./flake8-compat-5.x.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
pythonRelaxDepsHook
|
||||
setuptools-scm
|
||||
@@ -137,6 +141,10 @@ buildPythonApplication rec {
|
||||
"checkov"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
chmod +x $out/bin/checkov
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Static code analysis tool for infrastructure-as-code";
|
||||
homepage = "https://github.com/bridgecrewio/checkov";
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
diff --git a/flake8_plugins/flake8_class_attributes_plugin/tests/conftest.py b/flake8_plugins/flake8_class_attributes_plugin/tests/conftest.py
|
||||
index 1ad762aed..c91078dcf 100644
|
||||
--- a/flake8_plugins/flake8_class_attributes_plugin/tests/conftest.py
|
||||
+++ b/flake8_plugins/flake8_class_attributes_plugin/tests/conftest.py
|
||||
@@ -1,6 +1,7 @@
|
||||
import ast
|
||||
import os
|
||||
|
||||
+import flake8
|
||||
from flake8.options.manager import OptionManager
|
||||
|
||||
from flake8_plugins.flake8_class_attributes_plugin.flake8_class_attributes.checker import ClassAttributesChecker
|
||||
@@ -17,7 +18,11 @@ def run_validator_for_test_file(filename, max_annotations_complexity=None,
|
||||
raw_content = file_handler.read()
|
||||
tree = ast.parse(raw_content)
|
||||
|
||||
- options = OptionManager('flake8_class_attributes_order', '0.1.3')
|
||||
+ options = OptionManager(
|
||||
+ version=flake8.__version__,
|
||||
+ plugin_versions='flake8_class_attributes_order: 0.1.3',
|
||||
+ parents=[],
|
||||
+ )
|
||||
options.use_class_attributes_order_strict_mode = strict_mode
|
||||
options.class_attributes_order = attributes_order
|
||||
ClassAttributesChecker.parse_options(options)
|
||||
Reference in New Issue
Block a user