try fixing ci issues

3dgeo-heidelberg · Feb 27, 2024 · 5d867c0 · 5d867c0
1 parent 210b898
commit 5d867c0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -21,7 +21,6 @@ std::vector<std::string> FileUtils::handleFilePath(
     std::map<std::string, ObjectT> & params,
     const std::vector<std::string> & assetsDir
 ){
-    std::vector<std::string> filePaths(0);
     std::string path;
     bool extendedFilePath = false;
 
@@ -32,7 +31,6 @@ std::vector<std::string> FileUtils::handleFilePath(
     catch(std::exception &e){
         try{
             path = boost::get<std::string const &>(params["filepath"]);
-            filePaths.push_back(path);
         }
         catch(std::exception &e2){
             std::stringstream ss;