Drop hunting for venv at runtime in unit tests - just expect it to be…

… active
NOAA-OWP · Dec 27, 2023 · 83b3950 · 83b3950
1 parent 3ef981e
commit 83b3950
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/test/bmi/Bmi_Py_Adapter_Test.cpp b/test/bmi/Bmi_Py_Adapter_Test.cpp
@@ -150,16 +150,8 @@ void Bmi_Py_Adapter_Test::TearDown() {
 }
 
 void Bmi_Py_Adapter_Test::SetUpTestSuite() {
+    // Add the extern dir with our test lib to Python system path
     std::string module_directory = "./extern/";
-
-    #if 0
-    // Add the package dir from a local virtual environment directory also, if there is one
-    std::string venv_dir = py_dir_search({repo_root + "/.venv", repo_root + "/venv"});
-    if (!venv_dir.empty()) {
-        InterpreterUtil::addToPyPath(py_find_venv_site_packages_dir(venv_dir));
-    }
-    #endif
-    // Also add the extern dir with our test lib to Python system path
     InterpreterUtil::addToPyPath(module_directory);
 }
 

diff --git a/test/realizations/catchments/Bmi_Py_Formulation_Test.cpp b/test/realizations/catchments/Bmi_Py_Formulation_Test.cpp
@@ -218,19 +218,9 @@ void Bmi_Py_Formulation_Test::SetUp() {
 }
 
 void Bmi_Py_Formulation_Test::SetUpTestSuite() {
+    // Add the extern dir with our test lib to Python system path
     std::string module_directory = "./extern/";
-
-    #if 0
-    // Add the package dir from a local virtual environment directory also, if there is one
-    std::string venv_dir = py_dir_search({repo_root + "/.venv", repo_root + "/venv"});
-    if (!venv_dir.empty()) {
-        InterpreterUtil::addToPyPath(py_find_venv_site_packages_dir(venv_dir));
-    }
-    #endif
-    // Also add the extern dir with our test lib to Python system path
     InterpreterUtil::addToPyPath(module_directory);
-
-
 }
 
 void Bmi_Py_Formulation_Test::TearDown() {