From a04c04c4e3789008987ef18207ed242ff606ba1e Mon Sep 17 00:00:00 2001
From: lesander <4174509+lesander@users.noreply.github.com>
Date: Fri, 8 Nov 2024 14:03:08 +0100
Subject: [PATCH] fix ci

---
 .github/workflows/install.yml |  6 +-----
 .github/workflows/test.yaml   |  6 ++----
 .readthedocs.yml              |  5 ++++-
 MANIFEST.in                   |  2 +-
 doc/requirements.txt          |  9 ---------
 pyproject.toml                | 15 ++++++++++++++-
 test/README.md                |  6 ++----
 test/requirements-testing.txt | 11 -----------
 8 files changed, 24 insertions(+), 36 deletions(-)
 delete mode 100644 doc/requirements.txt
 delete mode 100644 test/requirements-testing.txt

diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index 398ff8ae3..9b9cbed4d 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -20,12 +20,8 @@ jobs:
     - name: Setup python-pip
       run: python -m pip install --upgrade pip
 
-    - name: Install dependencies
-      run: |
-        pip install -r requirements.txt
-
     - name: Install volatility3
       run: pip install .
 
     - name: Run volatility3
-      run: vol --help
\ No newline at end of file
+      run: vol --help
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 6358dd45d..930b68526 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -16,10 +16,8 @@ jobs:
 
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install Cmake
-        pip install build
-        pip install -r ./test/requirements-testing.txt
+        python -m pip install --upgrade pip Cmake build
+        pip install .[test]
 
     - name: Build PyPi packages
       run: |
diff --git a/.readthedocs.yml b/.readthedocs.yml
index e7c2b25d5..628e79ebf 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -20,4 +20,7 @@ build:
 # Optionally set the version of Python and requirements required to build your docs
 python:
   install:
-    - requirements: doc/requirements.txt
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
diff --git a/MANIFEST.in b/MANIFEST.in
index 1cec729f6..863621381 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 prune development
 include * .*
-include doc/make.bat doc/Makefile doc/requirements.txt
+include pyproject.toml doc/make.bat doc/Makefile
 recursive-include doc/source *
 recursive-include volatility3 *.json
 recursive-exclude doc/source volatility3.*.rst
diff --git a/doc/requirements.txt b/doc/requirements.txt
deleted file mode 100644
index d3ba51224..000000000
--- a/doc/requirements.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# These packages are required for building the documentation.
-sphinx>=4.0.0,<7
-sphinx_autodoc_typehints>=1.4.0
-sphinx-rtd-theme>=0.4.3
-
-yara-python
-yara-x
-pycryptodome
-pefile
diff --git a/pyproject.toml b/pyproject.toml
index 91848e1fd..a966e41b2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ authors = [
 ]
 requires-python = ">=3.9.0"
 license = { text = "VSL" }
-dynamic = ["dependencies", "optional-dependencies", "version"]
+dynamic = ["version"]
 
 dependencies = [
     "pefile>=2024.8.26",
@@ -34,6 +34,19 @@ dev = [
     "pyinstaller-hooks-contrib>=2024.9",
 ]
 
+test = [
+    "volatility3[dev]",
+    "pytest>=8.3.3,<9",
+    "yara-x>=0.10.0,<1",
+]
+
+docs = [
+    "volatility3[dev]",
+    "sphinx>=8.0.0,<7",
+    "sphinx-autodoc-typehints>=2.5.0,<3",
+    "sphinx-rtd-theme>=3.0.1,<4",
+]
+
 [project.urls]
 homepage = "https://github.com/volatilityfoundation/volatility3/"
 documentation = "https://volatility3.readthedocs.io/"
diff --git a/test/README.md b/test/README.md
index dcbe289b0..5891d9508 100644
--- a/test/README.md
+++ b/test/README.md
@@ -2,14 +2,12 @@
 
 ## Requirements
 
-The Volatility 3 Testing Framework requires the same version of Python as Volatility3 itself. To install the current set of dependencies that the framework requires, use a command like this:
+The Volatility 3 Testing Framework requires the same version of Python as Volatility 3 itself. To install the current set of dependencies that the framework requires, use a command like this:
 
 ```shell
-pip3 install -r requirements-testing.txt
+pip3 install -e .[test]
 ```
 
-NOTE: `requirements-testing.txt` can be found in this current `test/` directory.
-
 ## Quick Start: Manual Testing
 
 1. To test Volatility 3 on an image, first download one with a command such as:
diff --git a/test/requirements-testing.txt b/test/requirements-testing.txt
deleted file mode 100644
index 51c8f602c..000000000
--- a/test/requirements-testing.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# These packages are required for core functionality.
-pefile>=2017.8.1 #foo
-
-# The following packages are optional.
-# If certain packages are not necessary, place a comment (#) at the start of the line.
-
-# This is required for the yara plugins
-yara-python>=3.8.0
-yara-x>=0.5.0
-
-pytest>=7.0.0