Compatibility with cstruct v4

dissect/fat/c_exfat.py

@@ -1,6 +1,6 @@
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
-c_exfat_def = """
+exfat_def = """
 enum entry_types : uint8 {
     allocation_bitmap   = 0x81,
     upcase_table        = 0x82,
@@ -139,8 +139,7 @@
 """
 
 # default endianess is LE so we keep it that way.
-c_exfat = cstruct.cstruct()
-c_exfat.load(c_exfat_def)
+c_exfat = cstruct().load(exfat_def)
 
 EOC = 0xFFFFFFFF  # indicates end of cluster chain
 FID = 0xFFFFFFF8  # indicates start of FAT

dissect/fat/c_fat.py

@@ -1,7 +1,7 @@
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 # https://ogris.de/fatrepair/fat.c
-c_fat_def = """
+fat_def = """
 #define ATTR_READ_ONLY 0x01
 #define ATTR_HIDDEN    0x02
 #define ATTR_SYSTEM    0x04
@@ -90,8 +90,7 @@
 };
 """  # noqa: E501
 
-c_fat = cstruct.cstruct()
-c_fat.load(c_fat_def)
+c_fat = cstruct().load(fat_def)
 
 Fattype = c_fat.Fattype
 

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