Compatibility with cstruct v4

Author: Schamper

dissect/vmfs/c_vmfs.py

@@ -1,7 +1,7 @@
 import stat
 import struct
 
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 vmfs_def = """
 /* === System file addresses === */
@@ -368,8 +368,7 @@
 };
 """
 
-c_vmfs = cstruct.cstruct()
-c_vmfs.load(vmfs_def)
+c_vmfs = cstruct().load(vmfs_def)
 
 ADDRESS_TYPE_MASK = 7
 ResourceType = c_vmfs.ResourceType

pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
   "Topic :: Utilities",
 ]
 dependencies = [
-    "dissect.cstruct>=3.0.dev,<4.0.dev",
-    "dissect.util>=3.0.dev,<4.0.dev",
+    "dissect.cstruct>3,<5",
+    "dissect.util>2,<4",
 ]
 dynamic = ["version"]
 

tox.ini

@@ -15,6 +15,13 @@ deps =
     pytest
     pytest-cov
     coverage
+# Unfortunately, tox does not allow separate installation flags for the project
+# dependencies and the test dependencies. When running tox, we want to install the
+# project dependencies with the --pre flag, so that we get the latest version of all
+# dependencies. We do the installation step ourselves for this reason.
+skip_install = true
+commands_pre =
+    pip install --pre -e .
 commands =
     pytest --basetemp="{envtmpdir}" {posargs:--color=yes --cov=dissect --cov-report=term-missing -v tests}
     coverage report