feat: add new test management

seppzer0 · web-flow · commit 6fa9873a6c61 · 2025-06-02T00:00:43.000+02:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -45,10 +45,13 @@ jobs:
           . .venv/bin/activate
           echo PATH=${GITHUB_WORKSPACE}/.venv/bin:$PATH >> $GITHUB_ENV
 
-      - name: Build and assemble
+      - name: Run Tests
+        run: |
+          python3 -m pre_commit run --files builder/**/*.py
+
+      - name: Build
         run: |
           export PYTHONPATH=$(pwd)
-          #python3 scripts/common/py/run_tests.py
           python3 scripts/multi_build.py
 
       - name: Publish Artifacts
@@ -69,17 +72,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Retrieve artifacts
+      - name: Retrieve Artifacts
         uses: actions/download-artifact@v4
         with:
           name: build-artifacts
           path: "multi-build"
 
-      - name: Get current version
+      - name: Get Current Version
         id: version
         run: echo "version=$(python3 scripts/common/py/get_version.py)" >> $GITHUB_OUTPUT
 
-      - name: Form a tag name
+      - name: Form Tag
         id: tagname
         run: echo "tagname=v${{ steps.version.outputs.version }}" >> $GITHUB_OUTPUT
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,36 @@
+default_stages: [pre-commit]
+
+repos:
+-   repo: local
+    hooks:
+    -   id: ruff
+        name: Ruff
+        description: "Static analysts (SAST) via Ruff."
+        entry: ruff check
+        language: python
+        types_or: [python]
+        args: []
+        require_serial: true
+        additional_dependencies: []
+        minimum_pre_commit_version: "2.9.2"
+
+    -   id: pyright
+        name: Pyright
+        description: "Static typing check via Pyright."
+        entry: pyright
+        language: python
+        types_or: [python]
+        require_serial: true
+        additional_dependencies: []
+        minimum_pre_commit_version: "2.9.2"
+
+    -   id: pytest
+        name: Pytest
+        pass_filenames: false
+        description: "Unit testing via Pytest."
+        entry: pytest
+        language: python
+        types_or: [python]
+        require_serial: true
+        additional_dependencies: []
+        minimum_pre_commit_version: "2.9.2"
diff --git a/builder/__main__.py b/builder/__main__.py
@@ -6,7 +6,7 @@
 from pathlib import Path
 from importlib.metadata import version
 
-from builder.tools import cleaning as cm, commands as ccmd
+from builder.tools import cleaning as cm, commands as ccmd, Logger as logger
 from builder.configs import ArgumentConfig, DirectoryConfig as dcfg
 from builder.engines import GenericContainerEngine
 from builder.commands import KernelCommand, AssetsCommand, BundleCommand
@@ -238,6 +238,8 @@ def parse_args() -> argparse.Namespace:
 
 
 def main(args: argparse.Namespace) -> None:
+    # initialize the logger in memory
+    _ = logger().get_logger()  # type: ignore
     # start preparing the environment
     os.chdir(dcfg.root)
     if args.clean_root:
@@ -296,6 +298,6 @@ def main(args: argparse.Namespace) -> None:
 
 
 if __name__ == "__main__":
-    # for prints to show in the right order in various build / CI/CD systems
+    # for logs to show in the right order in various build / CI/CD systems
     sys.stdout = io.TextIOWrapper(open(sys.stdout.fileno(), "wb", 0), write_through=True)
     main(parse_args())
diff --git a/builder/clients/github.py b/builder/clients/github.py
@@ -1,6 +1,7 @@
 import os
 import sys
 import shutil
+import logging
 import requests
 from pathlib import Path
 from typing import Optional
@@ -10,7 +11,7 @@
 from builder.configs import DirectoryConfig as dcfg
 
 
-log = Logger().get_logger()
+log = logging.getLogger("ZeroKernelLogger")
 
 
 class GithubApiClient(BaseModel):
diff --git a/builder/clients/rom_api.py b/builder/clients/rom_api.py
@@ -1,11 +1,12 @@
 import requests
+import logging
 from pydantic import BaseModel
 
 from builder.tools import Logger
 from builder.interfaces import IRomApiClient
 
 
-log = Logger().get_logger()
+log = logging.getLogger("ZeroKernelLogger")
 
 
 class RomApiClient(BaseModel, IRomApiClient):
diff --git a/builder/commands/bundle.py b/builder/commands/bundle.py
@@ -1,6 +1,7 @@
 import os
 import json
 import shutil
+import logging
 import itertools
 from pathlib import Path
 from pydantic import BaseModel
@@ -13,7 +14,7 @@
 from builder.interfaces import ICommand, IBundleCommand
 
 
-log = Logger().get_logger()
+log = logging.getLogger("ZeroKernelLogger")
 
 
 class BundleCommand(BaseModel, ICommand, IBundleCommand):
diff --git a/builder/configs/argument.py b/builder/configs/argument.py
@@ -1,5 +1,6 @@
 import sys
 import json
+import logging
 import platform
 from pathlib import Path
 from pydantic import BaseModel
@@ -8,7 +9,7 @@
 from builder.tools import Logger, commands as ccmd
 
 
-log = Logger().get_logger()
+log = logging.getLogger("ZeroKernelLogger")
 
 
 class ArgumentConfig(BaseModel):
diff --git a/builder/core/assets_collector.py b/builder/core/assets_collector.py
@@ -1,5 +1,6 @@
 import os
 import sys
+import logging
 from typing import Literal
 from pydantic import BaseModel
 
@@ -9,7 +10,7 @@
 from builder.interfaces import IAssetsCollector
 
 
-log = Logger().get_logger()
+log = logging.getLogger("ZeroKernelLogger")
 
 
 class AssetsCollector(BaseModel, IAssetsCollector):
@@ -124,7 +125,7 @@ def _check(self) -> None:
                         os.chdir(dcfg.root)
                         log.info("Done!")
                     case "n":
-                        log.cancel("Cancelling asset download.")
+                        log.warning("Cancelling asset download.")
                     case _:
                         log.error("Invalid option selected.")
                         sys.exit(1)
diff --git a/builder/core/kernel_builder.py b/builder/core/kernel_builder.py
@@ -1,6 +1,7 @@
 import os
 import sys
 import time
+import logging
 from pathlib import Path
 from typing import Optional
 from pydantic import BaseModel
@@ -11,7 +12,7 @@
 from builder.interfaces import IKernelBuilder
 
 
-log = Logger().get_logger()
+log = logging.getLogger("ZeroKernelLogger")
 
 
 class KernelBuilder(BaseModel, IKernelBuilder):
diff --git a/builder/engines/generic_container.py b/builder/engines/generic_container.py
@@ -1,6 +1,7 @@
 import os
 import sys
 import shutil
+import logging
 from pathlib import Path
 from pydantic import BaseModel
 from typing import Optional, Literal
@@ -11,7 +12,7 @@
 from builder.interfaces import IGenericContainerEngine
 
 
-log = Logger().get_logger()
+log = logging.getLogger("ZeroKernelLogger")
 
 
 class GenericContainerEngine(BaseModel, IGenericContainerEngine):
diff --git a/builder/interfaces/modules.py b/builder/interfaces/modules.py
@@ -6,10 +6,6 @@
 class IKernelBuilder(ABC):
     """Interface for the kernel builder."""
 
-    @abstractmethod
-    def __init__(self, **kwargs) -> None:
-        raise NotImplementedError()
-
     @staticmethod
     @abstractmethod
     def write_localversion() -> None:
diff --git a/builder/managers/resource.py b/builder/managers/resource.py
@@ -2,6 +2,7 @@
 import sys
 import json
 import tarfile
+import logging
 from pathlib import Path
 from typing import Optional
 from pydantic import BaseModel
@@ -11,7 +12,7 @@
 from builder.interfaces import IResourceManager
 
 
-log = Logger().get_logger()
+log = logging.getLogger("ZeroKernelLogger")
 
 
 class ResourceManager(BaseModel, IResourceManager):
diff --git a/builder/tools/commands.py b/builder/tools/commands.py
@@ -1,12 +1,13 @@
 import os
 import sys
+import logging
 import subprocess
 from typing import Optional, Literal
 from subprocess import CompletedProcess
 
 from builder.tools import Logger
 
-log = Logger().get_logger()
+log = logging.getLogger("ZeroKernelLogger")
 
 
 def launch(
diff --git a/builder/tools/fileoperations.py b/builder/tools/fileoperations.py
@@ -1,14 +1,15 @@
 import os
 import sys
 import shutil
+import logging
 import requests
 from pathlib import Path
 from typing import Optional
 
 from builder.tools import Logger, commands as ccmd
 
 
-log = Logger().get_logger()
+log = logging.getLogger("ZeroKernelLogger")
 
 
 def ucopy(src: Path, dst: Path, exceptions: Optional[tuple[str | Path, ...]] = ()) -> None:
diff --git a/builder/tools/logger.py b/builder/tools/logger.py
@@ -20,6 +20,9 @@ class Logger:
     _instance = None
     _lock = threading.Lock()
 
+    def __init__(self):
+        raise RuntimeError("Call get_logger() instead.")
+
     def __new__(cls, *args, **kwargs) -> object:
         if not cls._instance:
             with cls._lock:
diff --git a/builder/utils/bridge.py b/builder/utils/bridge.py
@@ -6,14 +6,15 @@
 """
 
 import sys
+import logging
 import argparse
 
 from builder.tools import Logger
 from builder.managers import ResourceManager
 from builder.commands import KernelCommand, AssetsCommand, BundleCommand
 
 
-log = Logger().get_logger()
+log = logging.getLogger("ZeroKernelLogger")
 
 
 def parse_args() -> argparse.Namespace:
diff --git a/conanfile.py b/conanfile.py
@@ -3,7 +3,6 @@
 
 class ZeroKernelConan(ConanFile):
     name = "zero"
-    version = "0.6.0"
     author = "seppzer0"
     url = "https://gitlab.com/api/v4/projects/40803264/packages/conan"
     description = "An advanced Android kernel builder with Kali NetHunter support."
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "zero-kernel"
-version = "0.6.0"
+version = "0.6.1"
 description = "Advanced Android kernel builder with Kali NetHunter support."
 authors = [{name = "seppzer0"}]
 readme = "README.md"
@@ -45,6 +45,11 @@ dev-dependencies = [
     "pip",
 ]
 
+[[tool.uv.index]]
+name = "pypi"
+default = true
+url = "https://pypi.org/simple"
+
 [tool.coverage.run]
 source = [
     "builder/clients",
@@ -60,11 +65,13 @@ show_missing = true
 [tool.pyright]
 include = ["builder"]
 pythonVersion = "3.12"
+venvPath = "."
+venv = ".venv"
 
 [tool.ruff]
-include = ["builder/**/*.py", "scripts/**/*.py"]
+include = ["builder/**/*.py"]
 indent-width = 4
-line-length = 120
+line-length = 125
 exclude = [
     ".git",
     ".pytest_cache",
@@ -86,3 +93,7 @@ convention = "google"
 [tool.ruff.lint.flake8-quotes]
 docstring-quotes = "double"
 inline-quotes = "double"
+
+[tool.pytest.ini_options]
+addopts = "--import-mode=importlib -vv"
+testpaths = ["tests"]
diff --git a/requirement-uv.txt b/requirement-uv.txt
@@ -1 +1 @@
-uv==0.6.14
+uv==0.7.9
diff --git a/scripts/install_hooks.py b/scripts/install_hooks.py
diff --git a/tests/unit/builder/tools/test_messages.py b/tests/unit/builder/tools/test_messages.py
diff --git a/uv.lock b/uv.lock
