Merge branch 'main' into improve-index-support

Author: Schamper

dissect/esedb/c_esedb.py

@@ -9,7 +9,7 @@
 from dissect.cstruct import cstruct
 
 # https://github.com/microsoft/Extensible-Storage-Engine
-c_esedb_def = """
+esedb_def = """
 #define MAX_COMPUTERNAME_LENGTH 15
 
 typedef int64 DBTIME;
@@ -457,7 +457,7 @@
 };
 """  # noqa E501
 
-c_esedb = cstruct().load(c_esedb_def)
+c_esedb = cstruct().load(esedb_def)
 
 ulDAEMagic = 0x89ABCDEF
 pgnoFDPMSO = 4

pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
   "Topic :: Utilities",
 ]
 dependencies = [
-    "dissect.cstruct>=3.4.dev,<4.0.dev",
-    "dissect.util>=3.5.dev,<4.0.dev",
+    "dissect.cstruct>=4,<5",
+    "dissect.util>=3.5,<4",
 ]
 dynamic = ["version"]
 
@@ -35,6 +35,12 @@ homepage = "https://dissect.tools"
 documentation = "https://docs.dissect.tools/en/latest/projects/dissect.esedb"
 repository = "https://github.com/fox-it/dissect.esedb"
 
+[project.optional-dependencies]
+dev = [
+    "dissect.cstruct>=4.0.dev,<5.0.dev",
+    "dissect.util>=3.5.dev,<4.0.dev",
+]
+
 [tool.black]
 line-length = 120
 

tox.ini

@@ -5,12 +5,14 @@ envlist = lint, py3, pypy3
 # 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
-# This version of virtualenv will install setuptools version 65.5.0 and pip
-# 22.3. These versions fully support python projects defined only through a
-# pyproject.toml file (PEP-517/PEP-518/PEP-621)
-requires = virtualenv>=20.16.6
+# 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
+# the proper version resolving with (sub-)dependencies defining dev extra's.
+requires = virtualenv>=20.24.6
 
 [testenv]
+extras = dev
 deps =
     pytest
     pytest-cov