From 1d230b24bc425a944eee40be4292941526faf49d Mon Sep 17 00:00:00 2001 From: Schamper <1254028+Schamper@users.noreply.github.com> Date: Wed, 6 Nov 2024 16:48:43 +0100 Subject: [PATCH] Reflect move of XVA and VMA to dissect.archive --- dissect/target/loaders/vma.py | 2 +- dissect/target/loaders/xva.py | 2 +- pyproject.toml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dissect/target/loaders/vma.py b/dissect/target/loaders/vma.py index cc982825a..177d56507 100644 --- a/dissect/target/loaders/vma.py +++ b/dissect/target/loaders/vma.py @@ -1,4 +1,4 @@ -from dissect.hypervisor import vma +from dissect.archive import vma from dissect.target.containers.raw import RawContainer from dissect.target.loader import Loader diff --git a/dissect/target/loaders/xva.py b/dissect/target/loaders/xva.py index 0a1834146..4b1358c75 100644 --- a/dissect/target/loaders/xva.py +++ b/dissect/target/loaders/xva.py @@ -1,4 +1,4 @@ -from dissect.hypervisor import xva +from dissect.archive import xva from dissect.target.containers.raw import RawContainer from dissect.target.loader import Loader diff --git a/pyproject.toml b/pyproject.toml index bf09c2df0..5d8af0822 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,6 +47,7 @@ repository = "https://github.com/fox-it/dissect.target" [project.optional-dependencies] full = [ "asn1crypto", + "dissect.archive>=1,<2", "dissect.btrfs>=1,<2", "dissect.cim>=3,<4", "dissect.clfs>=1,<2", @@ -79,6 +80,7 @@ full = [ ] dev = [ "dissect.target[full,mqtt,yara]", + "dissect.archive[dev]>=1.0.dev,<2.0.dev", "dissect.btrfs[dev]>=1.0.dev,<2.0.dev", "dissect.cim[dev]>=3.0.dev,<4.0.dev", "dissect.clfs[dev]>=1.0.dev,<2.0.dev", @@ -101,7 +103,7 @@ dev = [ "dissect.util>=3.0.dev,<4.0.dev", "dissect.vmfs[dev]>=3.0.dev,<4.0.dev", "dissect.volume[dev]>=3.0.dev,<4.0.dev", - "dissect.xfs[dev]>=3.0.dev,<4.0.dev", + "dissect.xfs[dev]>=3.0.dev,<4.0.dev", ] yara = [ # Grab the dependencies for dissect.target