dissect.volume 3.16.dev1__tar.gz → 3.17.dev1__tar.gz

{dissect_volume-3.16.dev1 → dissect_volume-3.17.dev1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: dissect.volume
-Version: 3.16.dev1
+Version: 3.17.dev1
 Summary: A Dissect module implementing a parser for different disk volume and partition systems, for example LVM2, GPT and MBR
 Author-email: Dissect Team <dissect@fox-it.com>
-License: Affero General Public License v3
+License-Expression: AGPL-3.0-or-later
 Project-URL: homepage, https://dissect.tools
 Project-URL: documentation, https://docs.dissect.tools/en/latest/projects/dissect.volume
 Project-URL: repository, https://github.com/fox-it/dissect.volume
@@ -11,14 +11,13 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 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_volume-3.16.dev1 → dissect_volume-3.17.dev1}/dissect/volume/ddf/ddf.py

@@ -61,7 +61,7 @@ class DDFConfiguration(Configuration):
             sec = 0 if vdcr.secondary_element_count == 1 else vdcr.secondary_element_seq
 
             i = 0
-            for starting_block, pds in zip(vdcr.starting_block, vdcr.physical_disk_sequence):
+            for starting_block, pds in zip(vdcr.starting_block, vdcr.physical_disk_sequence, strict=False):
                 if matched_pd := pd_map.get(pds):
                     vd_pd_map[sec * count + i] = (starting_block, matched_pd)
 

{dissect_volume-3.16.dev1 → dissect_volume-3.17.dev1}/dissect/volume/lvm/metadata.py

@@ -1,16 +1,10 @@
 from __future__ import annotations
 
-import sys
 from dataclasses import dataclass
 from datetime import datetime  # noqa: TC003
 from functools import cache
-from typing import BinaryIO, Optional, get_args, get_origin, get_type_hints
-
-if sys.version_info >= (3, 10):
-    from types import UnionType  # novermin
-else:
-    # Python 3.9
-    from typing import Union as UnionType
+from types import UnionType
+from typing import BinaryIO, get_args, get_origin, get_type_hints
 
 from dissect.util import ts
 from dissect.util.stream import MappingStream
@@ -36,7 +30,7 @@ class MetaBase:
 
             type_ = get_origin(field_type)
 
-            if type_ is UnionType and field_type == Optional[field_type]:
+            if type_ is UnionType and field_type == field_type | None:
                 value = obj.get(field_name)
                 field_type = get_args(field_type)[0]
                 type_ = get_origin(field_type)
@@ -586,14 +580,3 @@ class RAIDSegment(Segment):
 
         if self.raids:
             self.raids = [tuple(self.raids[i : i + 2]) for i in range(0, len(self.raids), 2)]
-
-
-# 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, MetaBase) and hasattr(obj, "__annotations__"):
-            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_volume-3.16.dev1 → dissect_volume-3.17.dev1}/dissect/volume/raid/stream.py

@@ -358,7 +358,7 @@ class RAID456Stream(AlignedStream):
 
         stripe_size = self.virtual_disk.stripe_size
         while length:
-            stripe, offset_in_stripe, dd_idx, pd_idx, qd_idx, ddf_layout = self._get_stripe_read_info(offset)
+            stripe, offset_in_stripe, dd_idx, _, _, _ = self._get_stripe_read_info(offset)
             offset_in_device = stripe * stripe_size + offset_in_stripe
             dd_start, dd_dev = self.disk_map[dd_idx]
 

{dissect_volume-3.16.dev1 → dissect_volume-3.17.dev1}/dissect.volume.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: dissect.volume
-Version: 3.16.dev1
+Version: 3.17.dev1
 Summary: A Dissect module implementing a parser for different disk volume and partition systems, for example LVM2, GPT and MBR
 Author-email: Dissect Team <dissect@fox-it.com>
-License: Affero General Public License v3
+License-Expression: AGPL-3.0-or-later
 Project-URL: homepage, https://dissect.tools
 Project-URL: documentation, https://docs.dissect.tools/en/latest/projects/dissect.volume
 Project-URL: repository, https://github.com/fox-it/dissect.volume
@@ -11,14 +11,13 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 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_volume-3.16.dev1 → dissect_volume-3.17.dev1}/pyproject.toml

@@ -1,13 +1,14 @@
 [build-system]
-requires = ["setuptools>=65.5.0", "setuptools_scm[toml]>=6.4.0"]
+requires = ["setuptools>=77.0.0", "setuptools_scm[toml]>=6.4.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "dissect.volume"
 description = "A Dissect module implementing a parser for different disk volume and partition systems, for example LVM2, GPT and MBR"
 readme = "README.md"
-requires-python = "~=3.9"
-license.text = "Affero General Public License v3"
+requires-python = ">=3.10"
+license = "AGPL-3.0-or-later"
+license-files = ["LICENSE", "COPYRIGHT"]
 authors = [
   {name = "Dissect Team", email = "dissect@fox-it.com"}
 ]
@@ -16,7 +17,6 @@ classifiers = [
   "Environment :: Console",
   "Intended Audience :: Developers",
   "Intended Audience :: Information Technology",
-  "License :: OSI Approved",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3",
   "Topic :: Internet :: Log Analysis",
@@ -41,9 +41,29 @@ dev = [
     "dissect.util>=3.0.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"},
+]
+
 [tool.ruff]
 line-length = 120
-required-version = ">=0.9.0"
+required-version = ">=0.13.1"
 
 [tool.ruff.format]
 docstring-code-format = true
@@ -92,9 +112,6 @@ ignore = ["E203", "B904", "UP024", "ANN002", "ANN003", "ANN204", "ANN401", "SIM1
 known-first-party = ["dissect.volume"]
 known-third-party = ["dissect"]
 
-[tool.setuptools]
-license-files = ["LICENSE", "COPYRIGHT"]
-
 [tool.setuptools.packages.find]
 include = ["dissect.*"]
 

{dissect_volume-3.16.dev1 → dissect_volume-3.17.dev1}/tests/test_vinum_config.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import TYPE_CHECKING
 from unittest.mock import patch
 
@@ -30,7 +30,7 @@ from dissect.volume.vinum.config import (
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
-CONF_TS = datetime.min
+CONF_TS = datetime.min.replace(tzinfo=timezone.utc)
 
 
 def test_volume_state() -> None:

{dissect_volume-3.16.dev1 → dissect_volume-3.17.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
@@ -14,9 +14,9 @@ requires = virtualenv>=20.24.6
 [testenv]
 extras = dev
 deps =
-    pytest
     pytest-cov
     coverage
+dependency_groups = test
 commands =
     pytest --basetemp="{envtmpdir}" {posargs:--color=yes --cov=dissect --cov-report=term-missing -v tests}
     coverage report
@@ -24,26 +24,24 @@ commands =
 
 [testenv:build]
 package = skip
-deps =
-    build
+dependency_groups = build
 commands =
     pyproject-build
 
 [testenv:fix]
 package = skip
-deps =
-    ruff==0.9.2
+dependency_groups = lint
 commands =
+    ruff check --fix dissect tests
     ruff format dissect tests
 
 [testenv:lint]
 package = skip
-deps =
-    ruff==0.9.2
-    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