Fix #5328 via cbci_jenkins_libs#159

.github/actions/setup-env/action.yml

@@ -66,7 +66,7 @@ runs:
       if: runner.os == 'Windows'
       shell: pwsh
       run: |
-        pip install conan aqtinstall
+        python -m pip install conan aqtinstall pytest requests
         choco install ccache -y --no-progress
         if (Get-Command ccache -ErrorAction SilentlyContinue) { ccache -M 5G }
 
@@ -81,7 +81,7 @@ runs:
       run: |
         # Assumes python3 is available (e.g. from pyenv setup in main workflow)
         python3 -m pip install --upgrade pip
-        python3 -m pip install conan numpy aqtinstall
+        python3 -m pip install conan numpy aqtinstall pytest
 
     - name: Install QtIFW (macOS)
       if: runner.os == 'macOS' && inputs.install_qt == 'true'

.gitignore

@@ -60,3 +60,22 @@ src/cli/test/bundle_git/
 .windsurf/
 .cline/
 .continue/
+AGENTS.md
+
+# Virtual Environments
+venv/
+.venv/
+.venv_*/
+env/
+.env/
+
+# OpenStudio Test Artifacts
+src/cli/test/bundle_git/
+
+# Agent/Tooling
+.gemini/
+.opencode/
+.cursor/
+.windsurf/
+.cline/
+.continue/

Jenkinsfile_develop_osx

@@ -1,6 +1,6 @@
 //Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs
 
-@Library('cbci_shared_libs@bundler_update') _
+@Library('cbci_shared_libs') _
 
 // Build for PR to develop branch only.
 if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) {

Jenkinsfile_develop_ubuntu_2404

@@ -1,7 +1,7 @@
 
 //Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs
 
-@Library('cbci_shared_libs@bundler_update') _
+@Library('cbci_shared_libs') _
 
 // Build for PR to develop branch only.
 if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) {

python/engine/PythonEngine.cpp

@@ -98,30 +98,10 @@ PythonEngine::PythonEngine(int argc, char* argv[]) : ScriptEngine(argc, argv), p
   //   so it takes precedence (to limit incompatibility issues...)
   // * If the user didn't pass it, we use Py_SetPath set to the E+ standard_lib
 
-  std::vector<std::string> args(argv, std::next(argv, static_cast<std::ptrdiff_t>(argc)));
-  bool pythonHomePassed = false;
-  auto it = std::find(args.cbegin(), args.cend(), "--python_home");
-  if (it != args.cend()) {
-    openstudio::path pythonHomeDir(*std::next(it));
-    wchar_t* h = Py_DecodeLocale(pythonHomeDir.make_preferred().string().c_str(), nullptr);
-    Py_SetPythonHome(h);
-    pythonHomePassed = true;
-  } else {
-    wchar_t* a = Py_DecodeLocale(pathToPythonPackages.make_preferred().string().c_str(), nullptr);
-    Py_SetPath(a);
-  }
-
   Py_SetProgramName(program);  // optional but recommended
 
   Py_Initialize();
 
-  if (pythonHomePassed) {
-    addToPythonPath(pathToPythonPackages);
-  }
-#if defined(__APPLE__) || defined(__linux___) || defined(__unix__)
-  addToPythonPath(pathToPythonPackages / "lib-dynload");
-#endif
-
   PyObject* m = PyImport_AddModule("__main__");
   if (m == nullptr) {
     throw std::runtime_error("Unable to add module __main__ for python script execution");

python/engine/test/PythonEngine_GTest.cpp

@@ -13,6 +13,7 @@
 #include "../../../src/scriptengine/ScriptEngine.hpp"
 
 #include <fmt/format.h>
+#include <sstream>
 
 class PythonEngineFixture : public testing::Test
 {
@@ -23,6 +24,41 @@ class PythonEngineFixture : public testing::Test
     return scriptPath;
   }
 
+  // Helper to remove lines that are just carets (Python 3.11+ traceback style)
+  static std::string normalizeTraceback(const std::string& error) {
+    std::istringstream iss(error);
+    std::string line;
+    std::string result;
+    bool first = true;
+    while (std::getline(iss, line)) {
+      // Remove CR if present (Windows/mixed endings)
+      if (!line.empty() && line.back() == '\r') {
+        line.pop_back();
+      }
+
+      // Check if line contains only whitespace and carets, and at least one caret
+      bool only_carets = false;
+      if (line.find('^') != std::string::npos) {
+        only_carets = true;
+        for (char c : line) {
+          if (c != ' ' && c != '^') {
+            only_carets = false;
+            break;
+          }
+        }
+      }
+
+      if (!only_carets) {
+        if (!first) {
+          result += "\n";
+        }
+        result += line;
+        first = false;
+      }
+    }
+    return result;
+  }
+
  protected:
   // initialize for each test
   virtual void SetUp() override {
@@ -87,7 +123,6 @@ TEST_F(PythonEngineFixture, WrongMethodMeasure) {
 Traceback (most recent call last):
   File "{}", line 19, in arguments
     model.nonExistingMethod()
-    ^^^^^^^^^^^^^^^^^^^^^^^
 AttributeError: 'Model' object has no attribute 'nonExistingMethod')",
                 scriptPath.generic_string());
 
@@ -97,7 +132,7 @@ AttributeError: 'Model' object has no attribute 'nonExistingMethod')",
     ASSERT_FALSE(true) << "Expected measure arguments(model) to throw";
   } catch (std::exception& e) {
     std::string error = e.what();
-    EXPECT_EQ(expected_exception, error);
+    EXPECT_EQ(normalizeTraceback(expected_exception), normalizeTraceback(error));
   }
 }
 
@@ -119,13 +154,10 @@ Traceback (most recent call last):
     s(10)
   File "{0}", line 11, in s
     return s(x)
-           ^^^^
   File "{0}", line 11, in s
     return s(x)
-           ^^^^
   File "{0}", line 11, in s
     return s(x)
-           ^^^^
   [Previous line repeated 996 more times]
 RecursionError: maximum recursion depth exceeded)",
                 scriptPath.generic_string());
@@ -136,7 +168,7 @@ RecursionError: maximum recursion depth exceeded)",
     ASSERT_FALSE(true) << "Expected measure arguments(model) to throw";
   } catch (std::exception& e) {
     std::string error = e.what();
-    EXPECT_EQ(expected_exception, error);
+    EXPECT_EQ(normalizeTraceback(expected_exception), normalizeTraceback(error));
   }
 }
 

ruby/engine/measure_manager_server.rb

@@ -123,7 +123,12 @@ def do_POST (request, response)
         my_measures_dir = data[:my_measures_dir]
 
         if my_measures_dir
-          @my_measures_dir = my_measures_dir.to_s
+          my_measures_dir_str = my_measures_dir.to_s
+          # Validate that the directory exists
+          if !File.directory?(my_measures_dir_str)
+            raise "Directory '#{my_measures_dir_str}' does not exist"
+          end
+          @my_measures_dir = my_measures_dir_str
         end
 
         response.body = JSON.generate(result)