From d22349ac3dce49050de851a9a01dc2fca86f3e99 Mon Sep 17 00:00:00 2001 From: Miauwkeru Date: Fri, 19 Sep 2025 14:12:11 +0000 Subject: [PATCH 1/9] Change the minimum python version to 3.10 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f55e9f1..839b2d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" name = "dissect.ntfs" description = "A Dissect module implementing a parser for the NTFS file system, used by the Windows operating system" readme = "README.md" -requires-python = "~=3.9" +requires-python = ">=3.10" license.text = "Affero General Public License v3" authors = [ {name = "Dissect Team", email = "dissect@fox-it.com"} From d83776fb2dd593c3a1e2fd5df1aa1dff3138ec05 Mon Sep 17 00:00:00 2001 From: Miauwkeru Date: Fri, 19 Sep 2025 14:48:15 +0000 Subject: [PATCH 2/9] Update deprecated license settings --- pyproject.toml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 839b2d9..8a27bfc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [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] @@ -7,7 +7,8 @@ name = "dissect.ntfs" description = "A Dissect module implementing a parser for the NTFS file system, used by the Windows operating system" readme = "README.md" requires-python = ">=3.10" -license.text = "Affero General Public License v3" +license = "AGPL-3.0-or-later" +license-files = ["LICENSE", "COPYRIGHT"] authors = [ {name = "Dissect Team", email = "dissect@fox-it.com"} ] @@ -93,9 +94,6 @@ ignore = ["E203", "B904", "UP024", "ANN002", "ANN003", "ANN204", "ANN401", "SIM1 known-first-party = ["dissect.ntfs"] known-third-party = ["dissect"] -[tool.setuptools] -license-files = ["LICENSE", "COPYRIGHT"] - [tool.setuptools.packages.find] include = ["dissect.*"] From 6db4caf16fe124274eef197125f026799c47c4f2 Mon Sep 17 00:00:00 2001 From: Miauwkeru Date: Fri, 19 Sep 2025 15:39:24 +0000 Subject: [PATCH 3/9] remove 'License :: OSI approved' from specifiers --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8a27bfc..17c668b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,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", From 9e170c281292679af9df29719bf7def452f672f9 Mon Sep 17 00:00:00 2001 From: Miauwkeru Date: Mon, 22 Sep 2025 09:31:23 +0000 Subject: [PATCH 4/9] Change vermin minimum version to python3.10 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index c4d1023..682933c 100644 --- a/tox.ini +++ b/tox.ini @@ -43,7 +43,7 @@ deps = vermin commands = ruff check dissect tests - vermin -t=3.9- --no-tips --lint dissect tests + vermin -t=3.10- --no-tips --lint dissect tests [testenv:docs-build] allowlist_externals = make From dcde471c9aa587c0f58fccd3712b343747a1c112 Mon Sep 17 00:00:00 2001 From: Miauwkeru Date: Mon, 22 Sep 2025 11:59:47 +0000 Subject: [PATCH 5/9] Fix linting for python3.10 --- dissect/ntfs/c_ntfs.pyi | 3 +-- dissect/ntfs/index.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dissect/ntfs/c_ntfs.pyi b/dissect/ntfs/c_ntfs.pyi index 3a6a5cf..1253ea9 100644 --- a/dissect/ntfs/c_ntfs.pyi +++ b/dissect/ntfs/c_ntfs.pyi @@ -1,8 +1,7 @@ # Generated by cstruct-stubgen -from typing import BinaryIO, Literal, overload +from typing import BinaryIO, Literal, TypeAlias, overload import dissect.cstruct as __cs__ -from typing_extensions import TypeAlias class _c_ntfs(__cs__.cstruct): class FILE_ATTRIBUTE(__cs__.Flag): diff --git a/dissect/ntfs/index.py b/dissect/ntfs/index.py index 2379d0c..f664523 100644 --- a/dissect/ntfs/index.py +++ b/dissect/ntfs/index.py @@ -3,7 +3,7 @@ import io from enum import Enum, auto from functools import cached_property, lru_cache -from typing import TYPE_CHECKING, Any, BinaryIO, Callable +from typing import TYPE_CHECKING, Any, BinaryIO from dissect.ntfs.attr import AttributeRecord from dissect.ntfs.c_ntfs import ATTRIBUTE_TYPE_CODE, COLLATION, INDEX_ENTRY_END, INDEX_ENTRY_NODE, SECTOR_SHIFT, c_ntfs @@ -16,7 +16,7 @@ from dissect.ntfs.util import apply_fixup, segment_reference if TYPE_CHECKING: - from collections.abc import Iterator + from collections.abc import Callable, Iterator from dissect.ntfs.mft import MftRecord From c780760b2b4794c13ec27a341e780b32026663f1 Mon Sep 17 00:00:00 2001 From: Miauwkeru Date: Tue, 23 Sep 2025 09:19:56 +0000 Subject: [PATCH 6/9] Update lint and fix steps tox.ini --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 682933c..1531c68 100644 --- a/tox.ini +++ b/tox.ini @@ -34,6 +34,7 @@ package = skip deps = ruff==0.9.2 commands = + ruff check --fix dissect tests ruff format dissect tests [testenv:lint] @@ -43,6 +44,7 @@ deps = vermin commands = ruff check dissect tests + ruff format --check dissect tests vermin -t=3.10- --no-tips --lint dissect tests [testenv:docs-build] From 2615ed7a9e990c83681112066ae86ed36dcc60c0 Mon Sep 17 00:00:00 2001 From: Miauwkeru Date: Tue, 23 Sep 2025 09:31:57 +0000 Subject: [PATCH 7/9] Bump ruff version --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 1531c68..827d58c 100644 --- a/tox.ini +++ b/tox.ini @@ -32,7 +32,7 @@ commands = [testenv:fix] package = skip deps = - ruff==0.9.2 + ruff==0.13.1 commands = ruff check --fix dissect tests ruff format dissect tests @@ -40,7 +40,7 @@ commands = [testenv:lint] package = skip deps = - ruff==0.9.2 + ruff==0.13.1 vermin commands = ruff check dissect tests From feb97abc81013d70482617cde36427bca1581a7b Mon Sep 17 00:00:00 2001 From: Miauwkeru Date: Tue, 23 Sep 2025 13:43:45 +0000 Subject: [PATCH 8/9] Update project to use dependency groups --- pyproject.toml | 20 ++++++++++++++++++++ tox.ini | 14 +++++--------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 17c668b..f4967d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,6 +41,26 @@ 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" diff --git a/tox.ini b/tox.ini index 827d58c..284a4ba 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,24 +24,20 @@ commands = [testenv:build] package = skip -deps = - build +dependency_groups = build commands = pyproject-build [testenv:fix] package = skip -deps = - ruff==0.13.1 +dependency_groups = lint commands = ruff check --fix dissect tests ruff format dissect tests [testenv:lint] package = skip -deps = - ruff==0.13.1 - vermin +dependency_groups = lint commands = ruff check dissect tests ruff format --check dissect tests From fc6a003604365d86b58aca4573bbb40a2f36a1a1 Mon Sep 17 00:00:00 2001 From: Miauwkeru Date: Wed, 24 Sep 2025 12:38:14 +0000 Subject: [PATCH 9/9] Changing required ruff version to ">=0.13.1" --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f4967d0..97d3642 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,7 +63,7 @@ dev = [ [tool.ruff] line-length = 120 -required-version = ">=0.9.0" +required-version = ">=0.13.1" [tool.ruff.format] docstring-code-format = true