dissect.btrfs 1.8.dev1__tar.gz → 1.9.dev1__tar.gz

{dissect_btrfs-1.8.dev1 → dissect_btrfs-1.9.dev1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: dissect.btrfs
-Version: 1.8.dev1
+Version: 1.9.dev1
 Summary: A Dissect module implementing a parser for the Btrfs file system, a commonly used Linux filesystem.
 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.btrfs
 Project-URL: repository, https://github.com/fox-it/dissect.btrfs
@@ -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
@@ -28,8 +27,6 @@ Provides-Extra: full
 Requires-Dist: zstandard; extra == "full"
 Provides-Extra: gcrc32
 Requires-Dist: google-crc32c; extra == "gcrc32"
-Provides-Extra: lzo
-Requires-Dist: python-lzo; (platform_system != "Windows" or platform_python_implementation != "PyPy") and extra == "lzo"
 Provides-Extra: dev
 Requires-Dist: dissect.btrfs[full]; extra == "dev"
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
@@ -55,17 +52,10 @@ Information on the supported Python versions can be found in the Getting Started
 pip install dissect.btrfs
 ```
 
-This project decompresses lzo compressed file systems and can use the faster, native (C-based) lzo implementation when
-installed, instead of the slower pure Python implementation provided by `dissect.util`. To use these faster
-implementations, install the package with the lzo extra:
-
-```bash
-pip install "dissect.btrfs[lzo]"
-```
-
-Unfortunately there is no binary `python-lzo` wheel for PyPy installations on Windows, so it won't be installed there.
-
-This module including the lzo extra is also automatically installed if you install the `dissect` package.
+This project decompresses LZO compressed file systems and can use a faster, native (Rust-based) LZO implementation,
+instead of a slower pure Python implementation. Both implementations are provided by `dissect.util`.
+Pre-build wheels are available for most common platforms and the native implementation will automatically be used if available.
+In the rare case that a pre-build wheel is not available, please refer to `dissect.util` for build instructions.
 
 ## Build and test instructions
 

{dissect_btrfs-1.8.dev1 → dissect_btrfs-1.9.dev1}/README.md

@@ -17,17 +17,10 @@ Information on the supported Python versions can be found in the Getting Started
 pip install dissect.btrfs
 ```
 
-This project decompresses lzo compressed file systems and can use the faster, native (C-based) lzo implementation when
-installed, instead of the slower pure Python implementation provided by `dissect.util`. To use these faster
-implementations, install the package with the lzo extra:
-
-```bash
-pip install "dissect.btrfs[lzo]"
-```
-
-Unfortunately there is no binary `python-lzo` wheel for PyPy installations on Windows, so it won't be installed there.
-
-This module including the lzo extra is also automatically installed if you install the `dissect` package.
+This project decompresses LZO compressed file systems and can use a faster, native (Rust-based) LZO implementation,
+instead of a slower pure Python implementation. Both implementations are provided by `dissect.util`.
+Pre-build wheels are available for most common platforms and the native implementation will automatically be used if available.
+In the rare case that a pre-build wheel is not available, please refer to `dissect.util` for build instructions.
 
 ## Build and test instructions
 

{dissect_btrfs-1.8.dev1 → dissect_btrfs-1.9.dev1}/dissect.btrfs.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: dissect.btrfs
-Version: 1.8.dev1
+Version: 1.9.dev1
 Summary: A Dissect module implementing a parser for the Btrfs file system, a commonly used Linux filesystem.
 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.btrfs
 Project-URL: repository, https://github.com/fox-it/dissect.btrfs
@@ -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
@@ -28,8 +27,6 @@ Provides-Extra: full
 Requires-Dist: zstandard; extra == "full"
 Provides-Extra: gcrc32
 Requires-Dist: google-crc32c; extra == "gcrc32"
-Provides-Extra: lzo
-Requires-Dist: python-lzo; (platform_system != "Windows" or platform_python_implementation != "PyPy") and extra == "lzo"
 Provides-Extra: dev
 Requires-Dist: dissect.btrfs[full]; extra == "dev"
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
@@ -55,17 +52,10 @@ Information on the supported Python versions can be found in the Getting Started
 pip install dissect.btrfs
 ```
 
-This project decompresses lzo compressed file systems and can use the faster, native (C-based) lzo implementation when
-installed, instead of the slower pure Python implementation provided by `dissect.util`. To use these faster
-implementations, install the package with the lzo extra:
-
-```bash
-pip install "dissect.btrfs[lzo]"
-```
-
-Unfortunately there is no binary `python-lzo` wheel for PyPy installations on Windows, so it won't be installed there.
-
-This module including the lzo extra is also automatically installed if you install the `dissect` package.
+This project decompresses LZO compressed file systems and can use a faster, native (Rust-based) LZO implementation,
+instead of a slower pure Python implementation. Both implementations are provided by `dissect.util`.
+Pre-build wheels are available for most common platforms and the native implementation will automatically be used if available.
+In the rare case that a pre-build wheel is not available, please refer to `dissect.util` for build instructions.
 
 ## Build and test instructions
 

{dissect_btrfs-1.8.dev1 → dissect_btrfs-1.9.dev1}/dissect.btrfs.egg-info/requires.txt

@@ -11,8 +11,3 @@ zstandard
 
 [gcrc32]
 google-crc32c
-
-[lzo]
-
-[lzo:platform_system != "Windows" or platform_python_implementation != "PyPy"]
-python-lzo

{dissect_btrfs-1.8.dev1 → dissect_btrfs-1.9.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.btrfs"
 description = "A Dissect module implementing a parser for the Btrfs file system, a commonly used Linux filesystem."
 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",
@@ -42,20 +42,35 @@ full = [
 gcrc32 = [
     "google-crc32c",
 ]
-lzo = [
-    # There are no Windows PyPy wheels available for python-lzo
-    # So we use a pure python fallback for it.
-    "python-lzo; platform_system != 'Windows' or platform_python_implementation != 'PyPy'",
-]
 dev = [
     "dissect.btrfs[full]",
     "dissect.cstruct>=4.0.dev,<5.0.dev",
     "dissect.util>=3.22.dev,<4.0.dev", #TODO: Remove once we release a new dissect 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"},
+]
+
 [tool.ruff]
 line-length = 120
-required-version = ">=0.9.0"
+required-version = ">=0.13.1"
 
 [tool.ruff.format]
 docstring-code-format = true
@@ -104,9 +119,6 @@ ignore = ["E203", "B904", "UP024", "ANN002", "ANN003", "ANN204", "ANN401", "SIM1
 known-first-party = ["dissect.btrfs"]
 known-third-party = ["dissect"]
 
-[tool.setuptools]
-license-files = ["LICENSE", "COPYRIGHT"]
-
 [tool.setuptools.packages.find]
 include = ["dissect.*"]
 

{dissect_btrfs-1.8.dev1 → dissect_btrfs-1.9.dev1}/tests/test_btrfs.py

@@ -204,7 +204,7 @@ def test_btrfs_profiles_partial(fixture: str, request: pytest.FixtureRequest) ->
     fhs = fhs[:-1] if fixture == "btrfs_profile_dup" else fhs[1:]
 
     if fixture in ("btrfs_profile_dup", "btrfs_profile_raid0"):
-        with pytest.raises(Error, match="Missing stripe disk for chunk offset .+"):
+        with pytest.raises(Error, match=r"Missing stripe disk for chunk offset .+"):
             fs = Btrfs(fhs)
 
     elif fixture in ("btrfs_profile_raid5", "btrfs_profile_raid6"):

{dissect_btrfs-1.8.dev1 → dissect_btrfs-1.9.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
 
 [flake8]
 max-line-length = 120