Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 11 additions & 1 deletion src/demystify/demystify.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,17 @@
from .libs.outputhandlers.htmloutputclass import FormatAnalysisHTMLOutput
from .libs.outputhandlers.roguesgalleryoutputclass import rogueoutputclass
from .libs.outputhandlers.textoutputclass import FormatAnalysisTextOutput
from .sqlitefid.src.sqlitefid import sqlitefid

# pylint: disable=E0401; unable to import (not needed for local tests).
# pylint: disable=C0413; import not at top of file.
# pylint: disable=C0411; order of third-party imports.
sys.path.insert(0, str(pathlib.Path("./src/demystify/sqlitefid/src/sqlitefid/")))
print(
"PATH: %s %s",
os.path.exists(str(pathlib.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",
Expand Down
25 changes: 18 additions & 7 deletions src/demystify/libs/DemystifyAnalysisClass.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,33 @@
# pylint: disable=R0917; too-many positional args.

import logging
import os
import pathlib
import sys
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 . import AnalysisResultsClass, version
from .AnalysisQueriesClass import AnalysisQueries
from .DenylistQueriesClass import DenylistQueries
from .HandleDenylistClass import HandleDenylist
from .RoguesQueriesClass import RogueQueries

# pylint: disable=E0401; unable to import (not needed for local tests).
# pylint: disable=C0413; import not at top of file.
# pylint: disable=C0411; order of third-party imports.
sys.path.insert(
0, str(pathlib.Path("./src/demystify/pathlesstaken/src/pathlesstaken/"))
)
print(
"PATH: %s %s",
os.path.exists(
str(pathlib.Path("./src/demystify/pathlesstaken/src/pathlesstaken/"))
),
file=sys.stderr,
)
import pathlesstaken # noqa: E402


class AnalysisError(Exception):
"""Exception for DemystifyAnalysis object."""
Expand Down