Skip to content

Commit 30688d5

Browse files
authored
Merge pull request #704 from onekey-sec/update_flake_lock_action
Update flake.lock
2 parents 88edba3 + 9c687c5 commit 30688d5

File tree

9 files changed

+924
-665
lines changed

9 files changed

+924
-665
lines changed

flake.lock

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/unblob/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ let
107107

108108
pythonRelaxDeps = [
109109
"dissect.cstruct"
110+
"lief"
110111
"structlog"
111112
];
112113

poetry.lock

Lines changed: 872 additions & 615 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ packages = [
1010

1111
[tool.poetry.dependencies]
1212
python = "^3.8"
13-
click = "^8.1.3"
13+
click = "^8.1.7"
1414
"dissect.cstruct" = "^2.0"
15-
attrs = ">=22.2.0"
16-
structlog = ">=21.2.0"
17-
arpy = "^2.2.0"
18-
rarfile = "^4.0"
15+
attrs = ">=23.1.0"
16+
structlog = ">=24.1.0"
17+
arpy = "^2.3.0"
18+
rarfile = "^4.1"
1919
ubi-reader = "^0.8.9"
2020
plotext = ">=4.2.0,<6.0"
21-
pluggy = "^1.0.0"
21+
pluggy = "^1.3.0"
2222
python-magic = "^0.4.27"
23-
pyperscan = "^0.2.2"
24-
lark = "^1.1.2"
25-
lz4 = "^4.0.0"
23+
pyperscan = "^0.3.0"
24+
lark = "^1.1.8"
25+
lz4 = "^4.3.2"
2626
lief = "^0.12.3"
27-
cryptography = ">=39.0,<42.0"
28-
treelib = "^1.6.1"
29-
unblob-native = "^0.1.0"
27+
cryptography = ">=41.0,<42.0"
28+
treelib = "^1.7.0"
29+
unblob-native = "^0.1.1"
3030
jefferson = "^0.4.5"
3131
rich = "^13.3.5"
3232
pyfatfs = "^1.0.5"
@@ -35,22 +35,22 @@ pyfatfs = "^1.0.5"
3535
optional = true
3636

3737
[tool.poetry.group.dev.dependencies]
38-
pytest = "^6.2.4"
39-
pyright = "^1.1.307"
40-
pre-commit = "^2.15.0"
38+
pytest = "^7.4.4"
39+
pyright = "^1.1.347"
40+
pre-commit = "^3.5.0"
4141
pytest-cov = "^3.0.0"
42-
ruff = "^0.0.259"
42+
ruff = "^0.1.13"
4343
pyyaml = "^6.0.1"
4444

4545
[tool.poetry.group.docs]
4646
optional = true
4747

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

5555
[tool.poetry.scripts]
5656
unblob = "unblob.cli:main"
@@ -157,6 +157,7 @@ exclude = ["unblob/testing.py"]
157157

158158
[tool.pyright]
159159
exclude = ["build"]
160+
typeCheckingMode = "basic"
160161

161162
[build-system]
162163
requires = ["poetry-core>=1.0.0"]

tests/test_finder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def on_match(m, pattern_id, start, end):
8282
m.append((pattern_id, start, end))
8383
return Scan.Continue
8484

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

8787
assert len(matches) == 2
8888
assert matches[0][1] == 0

unblob/finder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def search_chunks(
150150
start_offset=0,
151151
)
152152

153-
scanner = hyperscan_db.build(hyperscan_context, _hyperscan_match)
153+
scanner = hyperscan_db.build(hyperscan_context, _hyperscan_match) # type: ignore
154154

155155
try:
156156
stream_scan_chunks(scanner, file, hyperscan_context)

unblob/handlers/archive/qnap/qnap_nas.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def calculate_chunk(self, file: File, start_offset: int) -> Optional[ValidChunk]
116116
context = QTSSearchContext(start_offset=start_offset, file=file, end_offset=-1)
117117

118118
try:
119-
scanner = hyperscan_stream_end_magic_db.build(context, _hyperscan_match)
119+
scanner = hyperscan_stream_end_magic_db.build(context, _hyperscan_match) # type: ignore
120120
stream_scan(scanner, file)
121121
except Exception as e:
122122
logger.debug(

unblob/handlers/compression/bzip2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def calculate_chunk(self, file: File, start_offset: int) -> Optional[ValidChunk]
140140
)
141141

142142
try:
143-
scanner = hyperscan_stream_end_magic_db.build(context, _hyperscan_match)
143+
scanner = hyperscan_stream_end_magic_db.build(context, _hyperscan_match) # type: ignore
144144
stream_scan(scanner, file)
145145
except Exception as e:
146146
logger.debug(

unblob/handlers/compression/xz.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def calculate_chunk(self, file: File, start_offset: int) -> Optional[ValidChunk]
182182
)
183183

184184
try:
185-
scanner = hyperscan_stream_end_magic_db.build(context, _hyperscan_match)
185+
scanner = hyperscan_stream_end_magic_db.build(context, _hyperscan_match) # type: ignore
186186
stream_scan(scanner, file)
187187
except Exception as e:
188188
logger.debug(

0 commit comments

Comments
 (0)