mirror of
https://github.com/mandiant/capa.git
synced 2025-12-22 23:26:21 -08:00
resolve conflict
This commit is contained in:
2
.github/ruff.toml
vendored
2
.github/ruff.toml
vendored
@@ -1,6 +1,6 @@
|
|||||||
select = ["E"]
|
select = ["E"]
|
||||||
ignore = ["E402", "E722", "E902"]
|
ignore = ["E402", "E722", "E902"]
|
||||||
exclude = ["*_pb2.py", "*_pb2.pyi", "capa2yara.py"]
|
exclude = ["*_pb2.py", "*_pb2.pyi", "capa2yara.py" , "test_engine.py"]
|
||||||
|
|
||||||
# Same as pycodestyle.
|
# Same as pycodestyle.
|
||||||
line-length = 180
|
line-length = 180
|
||||||
|
|||||||
2
setup.py
2
setup.py
@@ -75,7 +75,7 @@ setuptools.setup(
|
|||||||
"pytest-cov==4.0.0",
|
"pytest-cov==4.0.0",
|
||||||
"pycodestyle==2.10.0",
|
"pycodestyle==2.10.0",
|
||||||
"ruff==0.0.259",
|
"ruff==0.0.259",
|
||||||
"black==23.1.0",
|
"black==23.3.0",
|
||||||
"isort==5.11.4",
|
"isort==5.11.4",
|
||||||
"mypy==1.1.1",
|
"mypy==1.1.1",
|
||||||
"psutil==5.9.2",
|
"psutil==5.9.2",
|
||||||
|
|||||||
Reference in New Issue
Block a user