Merge branch 'volatilityfoundation:develop' into develop

Author: digitalisx

.github/workflows/black.yml

@@ -0,0 +1,13 @@
+name: Black python linter
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: psf/black@stable
+        with:
+          options: "--check --diff --verbose"
+          src: "./volatility3"

.github/workflows/build-pypi.yml

@@ -15,10 +15,10 @@ on:
 jobs:
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: ["3.6"]
+        python-version: ["3.7"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/test.yaml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ["3.6"]
+        python-version: ["3.7"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

README.md

@@ -20,7 +20,7 @@ more details.
 
 ## Requirements
 
-Volatility 3 requires Python 3.6.0 or later. To install the most minimal set of dependencies (some plugins will not work) use a command such as:
+Volatility 3 requires Python 3.7.0 or later. To install the most minimal set of dependencies (some plugins will not work) use a command such as:
 
 ```shell
 pip3 install -r requirements-minimal.txt

setup.py

@@ -6,45 +6,47 @@
 
 from volatility3.framework import constants
 
-with open("README.md", "r", encoding = "utf-8") as fh:
+with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
+
 def get_install_requires():
     requirements = []
-    with open("requirements-minimal.txt", "r", encoding="utf-8") as fh:
+    with open("requirements-minimal.txt", "r", encoding = "utf-8") as fh:
         for line in fh.readlines():
             stripped_line = line.strip()
             if stripped_line == "" or stripped_line.startswith("#"):
                 continue
             requirements.append(stripped_line)
     return requirements
 
-setuptools.setup(name = "volatility3",
-                 description = "Memory forensics framework",
-                 version = constants.PACKAGE_VERSION,
-                 license = "VSL",
-                 keywords = "volatility memory forensics framework windows linux volshell",
-                 author = "Volatility Foundation",
-                 long_description = long_description,
-                 long_description_content_type = "text/markdown",
-                 author_email = "[email protected]",
-                 url = "https://github.com/volatilityfoundation/volatility3/",
-                 project_urls = {
-                     "Bug Tracker": "https://github.com/volatilityfoundation/volatility3/issues",
-                     "Documentation": "https://volatility3.readthedocs.io/",
-                     "Source Code": "https://github.com/volatilityfoundation/volatility3",
-                 },
-                 python_requires = '>=3.6.0',
-                 include_package_data = True,
-                 exclude_package_data = {
-                     '': ['development', 'development.*'],
-                     'development': ['*']
-                 },
-                 packages = setuptools.find_namespace_packages(exclude = ["development", "development.*"]),
-                 entry_points = {
-                     'console_scripts': [
-                         'vol = volatility3.cli:main',
-                         'volshell = volatility3.cli.volshell:main',
-                     ],
-                 },
-                 install_requires = get_install_requires())
+setuptools.setup(
+    name="volatility3",
+    description="Memory forensics framework",
+    version=constants.PACKAGE_VERSION,
+    license="VSL",
+    keywords="volatility memory forensics framework windows linux volshell",
+    author="Volatility Foundation",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    author_email="[email protected]",
+    url="https://github.com/volatilityfoundation/volatility3/",
+    project_urls={
+        "Bug Tracker": "https://github.com/volatilityfoundation/volatility3/issues",
+        "Documentation": "https://volatility3.readthedocs.io/",
+        "Source Code": "https://github.com/volatilityfoundation/volatility3",
+    },
+    python_requires=">=3.7.0",
+    include_package_data=True,
+    exclude_package_data={"": ["development", "development.*"], "development": ["*"]},
+    packages=setuptools.find_namespace_packages(
+        exclude=["development", "development.*"]
+    ),
+    entry_points={
+        "console_scripts": [
+            "vol = volatility3.cli:main",
+            "volshell = volatility3.cli.volshell:main",
+        ],
+    },
+    install_requires=get_install_requires(),
+)

test/conftest.py

@@ -3,38 +3,57 @@
 import os
 import pytest
 
+
 def pytest_addoption(parser):
-    parser.addoption("--volatility", action="store", default=None,
+    parser.addoption(
+        "--volatility",
+        action="store",
+        default=None,
         required=True,
-        help="path to the volatility script")
+        help="path to the volatility script",
+    )
+
+    parser.addoption(
+        "--python",
+        action="store",
+        default="python3",
+        help="The name of the interpreter to use when running the volatility script",
+    )
 
-    parser.addoption("--python", action="store", default="python3",
-        help="The name of the interpreter to use when running the volatility script")
+    parser.addoption(
+        "--image", action="append", default=[], help="path to an image to test"
+    )
 
-    parser.addoption("--image", action="append", default=[],
-        help="path to an image to test")
+    parser.addoption(
+        "--image-dir",
+        action="append",
+        default=[],
+        help="path to a directory containing images to test",
+    )
 
-    parser.addoption("--image-dir", action="append", default=[],
-        help="path to a directory containing images to test")
 
 def pytest_generate_tests(metafunc):
     """Parameterize tests based on image names"""
 
-    images = metafunc.config.getoption('image')
-    for image_dir in metafunc.config.getoption('image_dir'):
-        images = images + [os.path.join(image_dir, dir) for dir in os.listdir(image_dir)]
+    images = metafunc.config.getoption("image")
+    for image_dir in metafunc.config.getoption("image_dir"):
+        images = images + [
+            os.path.join(image_dir, dir) for dir in os.listdir(image_dir)
+        ]
 
     # tests with "image" parameter are run against images
-    if 'image' in metafunc.fixturenames:
-        metafunc.parametrize("image",
-            images,
-            ids=[os.path.basename(image) for image in images])
+    if "image" in metafunc.fixturenames:
+        metafunc.parametrize(
+            "image", images, ids=[os.path.basename(image) for image in images]
+        )
+
 
 # Fixtures
 @pytest.fixture
 def volatility(request):
     return request.config.getoption("--volatility")
 
+
 @pytest.fixture
 def python(request):
-	return request.config.getoption("--python")
+    return request.config.getoption("--python")