acquire 3.14.dev9__tar.gz → 3.15.dev2__tar.gz

{acquire-3.14.dev9/acquire.egg-info → acquire-3.15.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: acquire
-Version: 3.14.dev9
+Version: 3.15.dev2
 Summary: A tool to quickly gather forensic artifacts from disk images or a live system into a lightweight container
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -22,15 +22,19 @@ Requires-Python: ~=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
-Requires-Dist: dissect.cstruct
-Requires-Dist: dissect.target
+Requires-Dist: dissect.cstruct<5,>=4.dev
+Requires-Dist: dissect.target<4,>=3.7
 Provides-Extra: full
 Requires-Dist: minio; extra == "full"
 Requires-Dist: pycryptodome; extra == "full"
 Requires-Dist: requests; extra == "full"
 Requires-Dist: rich; extra == "full"
-Requires-Dist: dissect.target[full]<4.0.dev,>=3.7.dev; extra == "full"
+Requires-Dist: dissect.target[full]<4,>=3.7; extra == "full"
 Requires-Dist: requests_toolbelt; extra == "full"
+Provides-Extra: dev
+Requires-Dist: acquire[full]; extra == "dev"
+Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
+Requires-Dist: dissect.target[dev]<4.0.dev,>=3.7.dev; extra == "dev"
 
 # Acquire
 

{acquire-3.14.dev9 → acquire-3.15.dev2}/acquire/crypt.py

@@ -2,7 +2,7 @@ import hashlib
 import io
 from datetime import datetime, timezone
 
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 try:
     from Crypto.Cipher import AES, PKCS1_OAEP
@@ -14,9 +14,7 @@ except ImportError:
     HAS_PYCRYPTODOME = False
 
 
-c_acquire = cstruct.cstruct()
-c_acquire.load(
-    """
+acquire_def = """
 enum HeaderType : uint8 {
     PKCS1_OAEP = 0x1,
 };
@@ -49,8 +47,7 @@ struct footer {
     uint16      length;                 // Digest length (precedes footer)
 };
 """
-)
-
+c_acquire = cstruct().load(acquire_def)
 
 FILE_MAGIC = b"ENCRYPTEDACQUIRE"
 FILE_VERSION = 1

{acquire-3.14.dev9 → acquire-3.15.dev2}/acquire/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.14.dev9'
-__version_tuple__ = version_tuple = (3, 14, 'dev9')
+__version__ = version = '3.15.dev2'
+__version_tuple__ = version_tuple = (3, 15, 'dev2')

{acquire-3.14.dev9 → acquire-3.15.dev2/acquire.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: acquire
-Version: 3.14.dev9
+Version: 3.15.dev2
 Summary: A tool to quickly gather forensic artifacts from disk images or a live system into a lightweight container
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -22,15 +22,19 @@ Requires-Python: ~=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
-Requires-Dist: dissect.cstruct
-Requires-Dist: dissect.target
+Requires-Dist: dissect.cstruct<5,>=4.dev
+Requires-Dist: dissect.target<4,>=3.7
 Provides-Extra: full
 Requires-Dist: minio; extra == "full"
 Requires-Dist: pycryptodome; extra == "full"
 Requires-Dist: requests; extra == "full"
 Requires-Dist: rich; extra == "full"
-Requires-Dist: dissect.target[full]<4.0.dev,>=3.7.dev; extra == "full"
+Requires-Dist: dissect.target[full]<4,>=3.7; extra == "full"
 Requires-Dist: requests_toolbelt; extra == "full"
+Provides-Extra: dev
+Requires-Dist: acquire[full]; extra == "dev"
+Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
+Requires-Dist: dissect.target[dev]<4.0.dev,>=3.7.dev; extra == "dev"
 
 # Acquire
 

acquire-3.15.dev2/acquire.egg-info/requires.txt

@@ -0,0 +1,15 @@
+dissect.cstruct<5,>=4.dev
+dissect.target<4,>=3.7
+
+[dev]
+acquire[full]
+dissect.cstruct<5.0.dev,>=4.0.dev
+dissect.target[dev]<4.0.dev,>=3.7.dev
+
+[full]
+minio
+pycryptodome
+requests
+rich
+dissect.target[full]<4,>=3.7
+requests_toolbelt

{acquire-3.14.dev9 → acquire-3.15.dev2}/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
   "Topic :: Utilities",
 ]
 dependencies = [
-    "dissect.cstruct",
-    "dissect.target",
+    "dissect.cstruct>=4.dev,<5",
+    "dissect.target>=3.7,<4",
 ]
 dynamic = ["version"]
 
@@ -41,9 +41,14 @@ full = [
     "pycryptodome",
     "requests",
     "rich",
-    "dissect.target[full]>=3.7.dev,<4.0.dev",
+    "dissect.target[full]>=3.7,<4",
     "requests_toolbelt",
 ]
+dev = [
+    "acquire[full]",
+    "dissect.cstruct>=4.0.dev,<5.0.dev",
+    "dissect.target[dev]>=3.7.dev,<4.0.dev",
+]
 
 [project.scripts]
 acquire = "acquire.acquire:main"

{acquire-3.14.dev9 → acquire-3.15.dev2}/tox.ini

@@ -5,13 +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 = full
+extras = dev
 deps =
     pytest
     pytest-cov

acquire-3.14.dev9/acquire.egg-info/requires.txt

@@ -1,10 +0,0 @@
-dissect.cstruct
-dissect.target
-
-[full]
-minio
-pycryptodome
-requests
-rich
-dissect.target[full]<4.0.dev,>=3.7.dev
-requests_toolbelt