From bad02f4938a2b254bb29df2a44ce801d77741104 Mon Sep 17 00:00:00 2001 From: ross-spencer Date: Wed, 17 Dec 2025 11:07:34 +0100 Subject: [PATCH] WIP: testing workflow with updated sub-modules --- .github/workflows/unit-tests.yml | 2 +- src/demystify/demystify.py | 14 +++++++++++++- src/demystify/libs/DemystifyAnalysisClass.py | 20 +++++++++++++------- src/demystify/pathlesstaken | 2 +- src/demystify/sqlitefid | 2 +- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 7871bbe..3ecc3ff 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -12,7 +12,7 @@ jobs: continue-on-error: ${{ matrix.experimental }} strategy: matrix: - os: [ubuntu-latest] + os: [windows-latest, ubuntu-latest] python-version: ["3.10", "3.11", "3.12"] experimental: [false] # Include experimental or bleeding-edge releases. diff --git a/src/demystify/demystify.py b/src/demystify/demystify.py index 0de2d7f..f1081c1 100644 --- a/src/demystify/demystify.py +++ b/src/demystify/demystify.py @@ -46,7 +46,19 @@ from .libs.outputhandlers.htmloutputclass import FormatAnalysisHTMLOutput from .libs.outputhandlers.roguesgalleryoutputclass import rogueoutputclass from .libs.outputhandlers.textoutputclass import FormatAnalysisTextOutput -from .sqlitefid.src.sqlitefid import sqlitefid + +from pathlib import Path + +# pylint: disable=E0401; unable to import (not needed for local tests). +# pylint: disable=C0413; import not at top of file. +sys.path.insert(0, str(Path("./src/demystify/sqlitefid/src/sqlitefid/"))) +print( + "PATH: %s %s", + os.path.exists(str(Path("./src/demystify/sqlitefid/src/sqlitefid/"))), + file=sys.stderr, +) +import sqlitefid # noqa: E402 + logging.basicConfig( format="%(asctime)-15s %(levelname)s :: %(filename)s:%(lineno)s:%(funcName)s() :: %(message)s", diff --git a/src/demystify/libs/DemystifyAnalysisClass.py b/src/demystify/libs/DemystifyAnalysisClass.py index 50b7248..2e29d85 100644 --- a/src/demystify/libs/DemystifyAnalysisClass.py +++ b/src/demystify/libs/DemystifyAnalysisClass.py @@ -2,17 +2,23 @@ # pylint: disable=R0917; too-many positional args. +import sys import logging from collections import Counter from configparser import NoOptionError -try: - # Required for imports calling from repository root. - from src.demystify.pathlesstaken.src.pathlesstaken import pathlesstaken -except ModuleNotFoundError: - # Required for Pypi install. - from ..pathlesstaken.src.pathlesstaken import pathlesstaken - +from pathlib import Path +import os + +# pylint: disable=E0401; unable to import (not needed for local tests). +# pylint: disable=C0413; import not at top of file. +sys.path.insert(0, str(Path("./src/demystify/pathlesstaken/src/pathlesstaken/"))) +print( + "PATH: %s %s", + os.path.exists(str(Path("./src/demystify/pathlesstaken/src/pathlesstaken/"))), + file=sys.stderr, +) +import pathlesstaken # noqa: E402 from . import AnalysisResultsClass, version from .AnalysisQueriesClass import AnalysisQueries from .DenylistQueriesClass import DenylistQueries diff --git a/src/demystify/pathlesstaken b/src/demystify/pathlesstaken index be8c2ae..4cf6cce 160000 --- a/src/demystify/pathlesstaken +++ b/src/demystify/pathlesstaken @@ -1 +1 @@ -Subproject commit be8c2ae8d23da13ae3fc915f00dc78eaede54fbe +Subproject commit 4cf6ccec2e56ec98786286b4b39e9fb7e8cf05ae diff --git a/src/demystify/sqlitefid b/src/demystify/sqlitefid index 6745d7d..e13c096 160000 --- a/src/demystify/sqlitefid +++ b/src/demystify/sqlitefid @@ -1 +1 @@ -Subproject commit 6745d7de73a9414fc866f863f6284519cf32fe11 +Subproject commit e13c096e3120503e16026c5fcf4a383e32f11b2b