dissect.fve 4.4.dev1__tar.gz → 4.5.dev1__tar.gz

{dissect_fve-4.4.dev1 → dissect_fve-4.5.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.fve
-Version: 4.4.dev1
+Version: 4.5.dev1
 Summary: A Dissect module implementing a parsers for full volume encryption implementations, currently Linux Unified Key Setup (LUKS1 and LUKS2) and Microsoft's Bitlocker Disk Encryption
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later
@@ -17,7 +17,7 @@ Classifier: Topic :: Internet :: Log Analysis
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: Security
 Classifier: Topic :: Utilities
-Requires-Python: ~=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT

{dissect_fve-4.4.dev1 → dissect_fve-4.5.dev1}/dissect/fve/crypto/_pycryptodome.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import hashlib
 import platform
 import sys
-from typing import Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from Crypto.Cipher import AES
 from Crypto.Util import _raw_api
@@ -18,6 +18,10 @@ else:
     # On PyPy the opposite is true, and also just use this as the default fallback
     from Crypto.Util.strxor import strxor as xor
 
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
 POINTER_SIZE = 8 if sys.maxsize > 2**32 else 4
 
 

{dissect_fve-4.4.dev1 → dissect_fve-4.5.dev1}/dissect/fve/luks/metadata.py

@@ -2,16 +2,9 @@ from __future__ import annotations
 
 import base64
 import json
-import sys
 from dataclasses import dataclass, field, fields
-
-if sys.version_info >= (3, 10):
-    from types import UnionType  # novermin
-else:
-    # Python 3.9
-    from typing import Union as UnionType
-
-from typing import Any, Optional, get_args, get_origin, get_type_hints
+from types import UnionType
+from typing import Any, get_args, get_origin, get_type_hints
 
 from dissect.fve.luks.c_luks import c_luks
 
@@ -45,7 +38,7 @@ class JsonItem:
     def _parse_type(type_: Any, value: str | int | dict | list) -> str | int | dict | list | bytes:
         result = None
 
-        if type_ == Optional[type_]:
+        if type_ == type_ | None:
             result = JsonItem._parse_type(get_args(type_)[0], value) if value is not None else None
         elif get_origin(type_) is UnionType:
             for atype in get_args(type_):
@@ -241,14 +234,3 @@ class Metadata(JsonItem):
         )
 
         return Metadata(config, keyslots, digests, segments, tokens)
-
-
-# Backward compatibility with Python 3.9
-if sys.version_info < (3, 10):
-    items = list(globals().values())
-    for obj in items:
-        if isinstance(obj, type) and issubclass(obj, JsonItem):
-            for k, v in obj.__annotations__.items():
-                if isinstance(v, str) and "|" in v:
-                    # Because we import Union as UnionType
-                    obj.__annotations__[k] = f"UnionType[{v.replace(' | ', ', ')}]"

{dissect_fve-4.4.dev1 → dissect_fve-4.5.dev1}/dissect.fve.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.fve
-Version: 4.4.dev1
+Version: 4.5.dev1
 Summary: A Dissect module implementing a parsers for full volume encryption implementations, currently Linux Unified Key Setup (LUKS1 and LUKS2) and Microsoft's Bitlocker Disk Encryption
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later
@@ -17,7 +17,7 @@ Classifier: Topic :: Internet :: Log Analysis
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: Security
 Classifier: Topic :: Utilities
-Requires-Python: ~=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT

{dissect_fve-4.4.dev1 → dissect_fve-4.5.dev1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "dissect.fve"
 description = "A Dissect module implementing a parsers for full volume encryption implementations, currently Linux Unified Key Setup (LUKS1 and LUKS2) and Microsoft's Bitlocker Disk Encryption"
 readme = "README.md"
-requires-python = "~=3.9"
+requires-python = ">=3.10"
 license = "AGPL-3.0-or-later"
 license-files = ["LICENSE", "COPYRIGHT"]
 authors = [
@@ -47,12 +47,32 @@ dev = [
     "dissect.util>=3.22.dev,<4.0.dev",
 ]
 
+[dependency-groups]
+test = [
+    "pytest",
+]
+lint = [
+    "ruff==0.13.1",
+    "vermin",
+]
+build = [
+    "build",
+]
+debug = [
+    "ipdb",
+]
+dev = [
+    {include-group = "test"},
+    {include-group = "lint"},
+    {include-group = "debug"},
+]
+
 [project.scripts]
 fve-dd = "dissect.fve.tools.dd:main"
 
 [tool.ruff]
 line-length = 120
-required-version = ">=0.12.0"
+required-version = ">=0.13.1"
 
 [tool.ruff.format]
 docstring-code-format = true

{dissect_fve-4.4.dev1 → dissect_fve-4.5.dev1}/tox.ini

@@ -4,7 +4,7 @@ envlist = lint, py3, pypy3
 # requires if they are not available on the host system. This requires the
 # locally installed tox to have a minimum version 3.3.0. This means the names
 # of the configuration options are still according to the tox 3.x syntax.
-minversion = 4.4.3
+minversion = 4.27.0
 # This version of virtualenv will install setuptools version 68.2.2 and pip
 # 23.3.1. These versions fully support python projects defined only through a
 # pyproject.toml file (PEP-517/PEP-518/PEP-621). This pip version also support
@@ -24,27 +24,24 @@ commands =
 
 [testenv:build]
 package = skip
-deps =
-    build
+dependency_groups = build
 commands =
     pyproject-build
 
 [testenv:fix]
 package = skip
-deps =
-    ruff==0.12.1
+dependency_groups = lint
 commands =
-    ruff format dissect tests
     ruff check --fix dissect tests
+    ruff format dissect tests
 
 [testenv:lint]
 package = skip
-deps =
-    ruff==0.12.1
-    vermin
+dependency_groups = lint
 commands =
     ruff check dissect tests
-    vermin -t=3.9- --no-tips --lint dissect tests
+    ruff format --check dissect tests
+    vermin -t=3.10- --no-tips --lint dissect tests
 
 [testenv:docs-build]
 allowlist_externals = make