[script] venv activation fix

EskoDijk · Jun 4, 2024 · 9b1e405 · 9b1e405
1 parent fdd86d6
commit 9b1e405
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/script/common.sh b/script/common.sh
@@ -116,3 +116,8 @@ build_openthread_versions()
         ./script/build_all "$(get_build_options)"
     )
 }
+
+activate_python_venv()
+{
+    source .venv-otns/bin/activate
+}
diff --git a/script/install b/script/install
@@ -39,7 +39,7 @@ install_otns()
 
 install_pyotns()
 {
-    source .venv-otns/bin/activate
+    activate_python_venv
     cd pylibs
     python3 -m pip install .
     # python3 setup.py install --user --prefix= 2>/dev/null  #  alternative - fails on macos-14

diff --git a/script/install-deps b/script/install-deps
@@ -57,7 +57,7 @@ install_python_libs()
     if [ ! -d .venv-otns ]; then
         python3 -m venv .venv-otns
     fi
-    source .venv-otns/bin/activate
+    activate_python_venv
     python3 -m pip install setuptools
 }
 

diff --git a/script/test b/script/test
@@ -84,6 +84,7 @@ install_otns()
 py_unittests()
 {
     install_deps
+    activate_python_venv
     python3 -m pip install -r "$OTNSDIR"/pylibs/unittests/requirements.txt
     install_otns
     build_openthread_br
@@ -105,6 +106,7 @@ py_unittests()
 py_versions_unittests()
 {
     install_deps
+    activate_python_venv
     python3 -m pip install -r "$OTNSDIR"/pylibs/unittests/requirements.txt
     install_otns
     build_openthread_versions
@@ -126,6 +128,7 @@ check_py_example()
 py_examples()
 {
     install_deps
+    activate_python_venv
     install_otns
     build_openthread_br
     build_openthread
@@ -145,6 +148,7 @@ py_examples()
 stress_tests()
 {
     install_deps
+    activate_python_venv
     install_otns
     build_openthread_br
     build_openthread