diff --git a/dissect/archive/vma.py b/dissect/archive/vma.py index 83ae325..e11a6b5 100644 --- a/dissect/archive/vma.py +++ b/dissect/archive/vma.py @@ -61,7 +61,7 @@ def __init__(self, fh: BinaryIO): blob_offset += size + 2 self._config: dict[str, bytes] = {} - for conf_name, conf_data in zip(self.header.config_names, self.header.config_data): + for conf_name, conf_data in zip(self.header.config_names, self.header.config_data, strict=False): if (conf_name, conf_data) == (0, 0): continue @@ -179,7 +179,7 @@ def __init__(self, fh: BinaryIO, offset: int): elif mask == 0: pass else: - block_offset += bin(mask).count("1") * c_vma.VMA_BLOCK_SIZE + block_offset += mask.bit_count() * c_vma.VMA_BLOCK_SIZE def __repr__(self) -> str: return f"" diff --git a/dissect/archive/wim.py b/dissect/archive/wim.py index f28358b..48a83d0 100644 --- a/dissect/archive/wim.py +++ b/dissect/archive/wim.py @@ -3,7 +3,7 @@ import io import struct from functools import cached_property, lru_cache -from typing import TYPE_CHECKING, BinaryIO, Callable +from typing import TYPE_CHECKING, BinaryIO from dissect.util.stream import AlignedStream, BufferedStream, RelativeStream from dissect.util.ts import wintimestamp @@ -26,7 +26,7 @@ ) if TYPE_CHECKING: - from collections.abc import Iterator + from collections.abc import Callable, Iterator from datetime import datetime DEFAULT_CHUNK_SIZE = 32 * 1024 diff --git a/pyproject.toml b/pyproject.toml index 0efe6a5..71ab0f7 100644 --- a/pyproject.toml +++ b/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.archive" description = "A Dissect module implementing parsers for various archive and backup formats" 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", @@ -45,6 +45,26 @@ dev = [ "dissect.util>=3.22.dev,<4.0.dev", #TODO: Remove once we release a new version ] +[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] vma-extract = "dissect.archive.tools.backup:main" vbk-extract = "dissect.archive.tools.backup:main" @@ -52,7 +72,7 @@ backup-extract = "dissect.archive.tools.backup:main" [tool.ruff] line-length = 120 -required-version = ">=0.9.0" +required-version = ">=0.13.1" [tool.ruff.format] docstring-code-format = true @@ -101,9 +121,6 @@ ignore = ["E203", "B904", "UP024", "ANN002", "ANN003", "ANN204", "ANN401", "SIM1 known-first-party = ["dissect.archive"] known-third-party = ["dissect"] -[tool.setuptools] -license-files = ["LICENSE", "COPYRIGHT"] - [tool.setuptools.packages.find] include = ["dissect.*"] diff --git a/tox.ini b/tox.ini index 07a0873..9685232 100644 --- a/tox.ini +++ b/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 [flake8] max-line-length = 120