dissect.archive 1.8.dev2__tar.gz → 1.9.dev2__tar.gz

{dissect_archive-1.8.dev2 → dissect_archive-1.9.dev2}/.git-blame-ignore-revs

@@ -4,3 +4,5 @@
 #
 # Change linter to Ruff (#11)
 1683c5a051a599f5db1419a722b82c3886742555
+# Add stricter Ruff linting (#25)
+55d70946ca74537b9db6c688ea6d6146b480a549

{dissect_archive-1.8.dev2 → dissect_archive-1.9.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.archive
-Version: 1.8.dev2
+Version: 1.9.dev2
 Summary: A Dissect module implementing parsers for various archive and backup formats
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later

{dissect_archive-1.8.dev2 → dissect_archive-1.9.dev2}/dissect/archive/c_vbk.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dissect.cstruct import cstruct
 
 vbk_def = """

{dissect_archive-1.8.dev2 → dissect_archive-1.9.dev2}/dissect/archive/c_vma.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dissect.cstruct import cstruct
 
 vma_def = """

{dissect_archive-1.8.dev2 → dissect_archive-1.9.dev2}/dissect/archive/c_wim.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dissect.cstruct import cstruct
 from dissect.util.compression import lzxpress_huffman
 

{dissect_archive-1.8.dev2 → dissect_archive-1.9.dev2}/dissect/archive/exceptions.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 class Error(Exception):
     pass
 

{dissect_archive-1.8.dev2 → dissect_archive-1.9.dev2}/dissect/archive/tools/backup.py

@@ -4,11 +4,15 @@ import argparse
 import logging
 import sys
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 from dissect.archive.c_vma import c_vma
-from dissect.archive.vbk import VBK, DirItem
+from dissect.archive.vbk import VBK
 from dissect.archive.vma import VMA, _iter_mask
 
+if TYPE_CHECKING:
+    from dissect.archive.vbk import DirItem
+
 try:
     from rich.logging import RichHandler
     from rich.progress import (

{dissect_archive-1.8.dev2 → dissect_archive-1.9.dev2}/dissect/archive/vbk.py

@@ -907,7 +907,6 @@ class MetaVector2(MetaVector[T]):
         Args:
             idx: The page index to lookup the page number for.
         """
-
         # MetaVec2 pages are a little special
         # The first page has a 16 byte header:
         # - 8 bytes for the next page number

{dissect_archive-1.8.dev2 → dissect_archive-1.9.dev2}/dissect.archive.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.archive
-Version: 1.8.dev2
+Version: 1.9.dev2
 Summary: A Dissect module implementing parsers for various archive and backup formats
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later

{dissect_archive-1.8.dev2 → dissect_archive-1.9.dev2}/pyproject.toml

@@ -103,7 +103,7 @@ select = [
   "SLOT",
   "SIM",
   "TID",
-  "TCH",
+  "TC",
   "PTH",
   "PLC",
   "TRY",
@@ -111,8 +111,26 @@ select = [
   "PERF",
   "FURB",
   "RUF",
+  "D"
 ]
-ignore = ["E203", "B904", "UP024", "ANN002", "ANN003", "ANN204", "ANN401", "SIM105", "TRY003"]
+
+ignore = [
+    "E203", "B904", "UP024", "ANN002", "ANN003", "ANN204", "ANN401", "SIM105", "TRY003", "PLC0415",
+    # Ignore some pydocstyle rules for now as they require a larger cleanup
+    "D1",
+    "D205",
+    "D301",
+    "D417",
+    # Seems bugged: https://github.com/astral-sh/ruff/issues/16824
+    "D402",
+]
+future-annotations = true
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
+[tool.ruff.lint.flake8-type-checking]
+strict = true
 
 [tool.ruff.lint.per-file-ignores]
 "tests/docs/**" = ["INP001"]
@@ -120,6 +138,7 @@ ignore = ["E203", "B904", "UP024", "ANN002", "ANN003", "ANN204", "ANN401", "SIM1
 [tool.ruff.lint.isort]
 known-first-party = ["dissect.archive"]
 known-third-party = ["dissect"]
+required-imports = ["from __future__ import annotations"]
 
 [tool.setuptools.packages.find]
 include = ["dissect.*"]

{dissect_archive-1.8.dev2 → dissect_archive-1.9.dev2}/tests/_docs/conf.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 project = "dissect.archive"
 
 extensions = [

{dissect_archive-1.8.dev2 → dissect_archive-1.9.dev2}/tests/test_exceptions.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from dissect.archive import exceptions

{dissect_archive-1.8.dev2 → dissect_archive-1.9.dev2}/tests/test_vbk.py

@@ -16,7 +16,7 @@ from dissect.archive.vbk import (
 
 
 def test_vbk_version_9(vbk9: BinaryIO) -> None:
-    """test VBK parsing for version 9 files"""
+    """Test VBK parsing for version 9 files."""
     vbk = VBK(vbk9)
 
     assert vbk.format_version == 9
@@ -52,7 +52,7 @@ def test_vbk_version_9(vbk9: BinaryIO) -> None:
 
 
 def test_vbk_version_13(vbk13: BinaryIO) -> None:
-    """test VBK parsing for version 13 files"""
+    """Test VBK parsing for version 13 files."""
     vbk = VBK(vbk13)
 
     assert vbk.format_version == 13
@@ -89,8 +89,7 @@ def test_vbk_version_13(vbk13: BinaryIO) -> None:
 
 
 def test_metavector2_lookup() -> None:
-    """test that the lookup logic in MetaVector2 works as expected"""
-
+    """Test that the lookup logic in MetaVector2 works as expected."""
     raw_blob = []
     entry = 0
     num_pages = 11