Skip to content

Commit

Permalink
Merge pull request #704 from onekey-sec/update_flake_lock_action
Browse files Browse the repository at this point in the history
Update flake.lock
  • Loading branch information
qkaiser authored Jan 22, 2024
2 parents 88edba3 + 9c687c5 commit 30688d5
Show file tree
Hide file tree
Showing 9 changed files with 924 additions and 665 deletions.
48 changes: 24 additions & 24 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions nix/unblob/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ let

pythonRelaxDeps = [
"dissect.cstruct"
"lief"
"structlog"
];

Expand Down
1,487 changes: 872 additions & 615 deletions poetry.lock

Large diffs are not rendered by default.

43 changes: 22 additions & 21 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ packages = [

[tool.poetry.dependencies]
python = "^3.8"
click = "^8.1.3"
click = "^8.1.7"
"dissect.cstruct" = "^2.0"
attrs = ">=22.2.0"
structlog = ">=21.2.0"
arpy = "^2.2.0"
rarfile = "^4.0"
attrs = ">=23.1.0"
structlog = ">=24.1.0"
arpy = "^2.3.0"
rarfile = "^4.1"
ubi-reader = "^0.8.9"
plotext = ">=4.2.0,<6.0"
pluggy = "^1.0.0"
pluggy = "^1.3.0"
python-magic = "^0.4.27"
pyperscan = "^0.2.2"
lark = "^1.1.2"
lz4 = "^4.0.0"
pyperscan = "^0.3.0"
lark = "^1.1.8"
lz4 = "^4.3.2"
lief = "^0.12.3"
cryptography = ">=39.0,<42.0"
treelib = "^1.6.1"
unblob-native = "^0.1.0"
cryptography = ">=41.0,<42.0"
treelib = "^1.7.0"
unblob-native = "^0.1.1"
jefferson = "^0.4.5"
rich = "^13.3.5"
pyfatfs = "^1.0.5"
Expand All @@ -35,22 +35,22 @@ pyfatfs = "^1.0.5"
optional = true

[tool.poetry.group.dev.dependencies]
pytest = "^6.2.4"
pyright = "^1.1.307"
pre-commit = "^2.15.0"
pytest = "^7.4.4"
pyright = "^1.1.347"
pre-commit = "^3.5.0"
pytest-cov = "^3.0.0"
ruff = "^0.0.259"
ruff = "^0.1.13"
pyyaml = "^6.0.1"

[tool.poetry.group.docs]
optional = true

[tool.poetry.group.docs.dependencies]
mkdocs-material = "8.5.10"
mkdocstrings = "^0.19.1"
pillow = ">=9.4,<11.0"
cairosvg = "^2.7.0"
mkdocstrings-python = "^0.8.3"
mkdocs-material = "9.5.4"
mkdocstrings = "^0.24.0"
pillow = ">=10.2.0,<11.0"
cairosvg = "^2.7.1"
mkdocstrings-python = "^1.8.0"

[tool.poetry.scripts]
unblob = "unblob.cli:main"
Expand Down Expand Up @@ -157,6 +157,7 @@ exclude = ["unblob/testing.py"]

[tool.pyright]
exclude = ["build"]
typeCheckingMode = "basic"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down
2 changes: 1 addition & 1 deletion tests/test_finder.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def on_match(m, pattern_id, start, end):
m.append((pattern_id, start, end))
return Scan.Continue

db.build(matches, on_match).scan(b"A123456789BB")
db.build(matches, on_match).scan(b"A123456789BB") # type: ignore

assert len(matches) == 2
assert matches[0][1] == 0
Expand Down
2 changes: 1 addition & 1 deletion unblob/finder.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def search_chunks(
start_offset=0,
)

scanner = hyperscan_db.build(hyperscan_context, _hyperscan_match)
scanner = hyperscan_db.build(hyperscan_context, _hyperscan_match) # type: ignore

try:
stream_scan_chunks(scanner, file, hyperscan_context)
Expand Down
2 changes: 1 addition & 1 deletion unblob/handlers/archive/qnap/qnap_nas.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def calculate_chunk(self, file: File, start_offset: int) -> Optional[ValidChunk]
context = QTSSearchContext(start_offset=start_offset, file=file, end_offset=-1)

try:
scanner = hyperscan_stream_end_magic_db.build(context, _hyperscan_match)
scanner = hyperscan_stream_end_magic_db.build(context, _hyperscan_match) # type: ignore
stream_scan(scanner, file)
except Exception as e:
logger.debug(
Expand Down
2 changes: 1 addition & 1 deletion unblob/handlers/compression/bzip2.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def calculate_chunk(self, file: File, start_offset: int) -> Optional[ValidChunk]
)

try:
scanner = hyperscan_stream_end_magic_db.build(context, _hyperscan_match)
scanner = hyperscan_stream_end_magic_db.build(context, _hyperscan_match) # type: ignore
stream_scan(scanner, file)
except Exception as e:
logger.debug(
Expand Down
2 changes: 1 addition & 1 deletion unblob/handlers/compression/xz.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def calculate_chunk(self, file: File, start_offset: int) -> Optional[ValidChunk]
)

try:
scanner = hyperscan_stream_end_magic_db.build(context, _hyperscan_match)
scanner = hyperscan_stream_end_magic_db.build(context, _hyperscan_match) # type: ignore
stream_scan(scanner, file)
except Exception as e:
logger.debug(
Expand Down

0 comments on commit 30688d5

Please sign in to comment.