From 5d867c0bab3d9040762e1b82ac4dac462faed901 Mon Sep 17 00:00:00 2001 From: Dominic Kempf Date: Tue, 27 Feb 2024 10:39:02 +0100 Subject: [PATCH] try fixing ci issues --- .github/workflows/ci.yml | 4 +++- python/pyhelios/__main__.py | 4 ++++ src/filems/util/FileUtils.cpp | 2 -- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42a633c61..31ef820b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,9 +45,11 @@ jobs: - name: Install Helios run: | - CMAKE_PREFIX_PATH=${CONDA_PREFIX} python -m pip install -v . + python -m pip install -v . - name: Run tests run: | + pwd + ls -al python -m pytest -m exe python -m pytest -m pyh diff --git a/python/pyhelios/__main__.py b/python/pyhelios/__main__.py index d51a7c5b3..d9a22e69d 100644 --- a/python/pyhelios/__main__.py +++ b/python/pyhelios/__main__.py @@ -1,4 +1,5 @@ import importlib_resources as resources +import os import subprocess import sys @@ -9,6 +10,9 @@ def _get_executable(): def helios_exec(args): + # Inject additional arguments to account for standard paths + args = args + ["--assets", os.getcwd()] + executable = _get_executable() return subprocess.call([executable] + args) diff --git a/src/filems/util/FileUtils.cpp b/src/filems/util/FileUtils.cpp index 11591c540..81c007dc0 100644 --- a/src/filems/util/FileUtils.cpp +++ b/src/filems/util/FileUtils.cpp @@ -21,7 +21,6 @@ std::vector FileUtils::handleFilePath( std::map & params, const std::vector & assetsDir ){ - std::vector filePaths(0); std::string path; bool extendedFilePath = false; @@ -32,7 +31,6 @@ std::vector FileUtils::handleFilePath( catch(std::exception &e){ try{ path = boost::get(params["filepath"]); - filePaths.push_back(path); } catch(std::exception &e2){ std::stringstream ss;