resolve conflict

This commit is contained in:
Pratham Chauhan
2023-04-04 18:46:31 +05:30
parent a260b35c9d
commit 89c6c235f7
2 changed files with 2 additions and 2 deletions

2
.github/ruff.toml vendored
View File

@@ -1,6 +1,6 @@
select = ["E"]
ignore = ["E402", "E722", "E902"]
exclude = ["*_pb2.py", "*_pb2.pyi", "capa2yara.py"]
exclude = ["*_pb2.py", "*_pb2.pyi", "capa2yara.py" , "test_engine.py"]
# Same as pycodestyle.
line-length = 180

View File

@@ -75,7 +75,7 @@ setuptools.setup(
"pytest-cov==4.0.0",
"pycodestyle==2.10.0",
"ruff==0.0.259",
"black==23.1.0",
"black==23.3.0",
"isort==5.11.4",
"mypy==1.1.1",
"psutil==5.9.2",