Renamed setup function to be consistent with convention.

raven-computing · Dec 12, 2024 · 27826c9 · 27826c9
1 parent 4f93fd0
commit 27826c9
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 16 deletions.
diff --git a/python/01_installable_script/source/build.sh b/python/01_installable_script/source/build.sh
@@ -93,7 +93,7 @@ ${{VAR_SCRIPT_BUILD_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/python/01_installable_script/source/test.sh b/python/01_installable_script/source/test.sh
@@ -66,7 +66,7 @@ ${{VAR_SCRIPT_TEST_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/python/02_library/source/build.sh b/python/02_library/source/build.sh
@@ -93,7 +93,7 @@ ${{VAR_SCRIPT_BUILD_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/python/02_library/source/test.sh b/python/02_library/source/test.sh
@@ -67,7 +67,7 @@ ${{VAR_SCRIPT_TEST_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/python/03_library_native_ctypes/source/build.sh b/python/03_library_native_ctypes/source/build.sh
@@ -93,7 +93,7 @@ ${{VAR_SCRIPT_BUILD_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/python/03_library_native_ctypes/source/test.sh b/python/03_library_native_ctypes/source/test.sh
@@ -67,7 +67,7 @@ ${{VAR_SCRIPT_TEST_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/python/04_library_native_cext/source/build.sh b/python/04_library_native_cext/source/build.sh
@@ -93,7 +93,7 @@ ${{VAR_SCRIPT_BUILD_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/python/04_library_native_cext/source/test.sh b/python/04_library_native_cext/source/test.sh
@@ -67,7 +67,7 @@ ${{VAR_SCRIPT_TEST_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/python/05_library_native_cython/source/build.sh b/python/05_library_native_cython/source/build.sh
@@ -93,7 +93,7 @@ ${{VAR_SCRIPT_BUILD_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/python/05_library_native_cython/source/test.sh b/python/05_library_native_cython/source/test.sh
@@ -76,7 +76,7 @@ ${{VAR_SCRIPT_TEST_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/python/06_server-cherrypy/source/build.sh b/python/06_server-cherrypy/source/build.sh
@@ -93,7 +93,7 @@ ${{VAR_SCRIPT_BUILD_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/python/06_server-cherrypy/source/test.sh b/python/06_server-cherrypy/source/test.sh
@@ -86,7 +86,7 @@ ${{VAR_SCRIPT_TEST_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/python/07_odoo_module/source/build.sh b/python/07_odoo_module/source/build.sh
@@ -93,7 +93,7 @@ ${{VAR_SCRIPT_BUILD_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/python/07_odoo_module/source/test.sh b/python/07_odoo_module/source/test.sh
@@ -82,7 +82,7 @@ ${{VAR_SCRIPT_TEST_ISOLATED_MAIN}}
 
 if [[ $ARG_NO_VIRTUALENV == false ]]; then
   # Setup and activate virtual environment
-  if ! setup_virtual_env; then
+  if ! project_setup_virtual_env; then
     exit 1;
   fi
 fi

diff --git a/share/python/setup.sh b/share/python/setup.sh
@@ -35,7 +35,7 @@ function __project_confirm_setup() {
   esac
 }
 
-function setup_virtual_env() {
+function project_setup_virtual_env() {
   # Check for prerequisites
   local virtualenvwrapper_script="$(which virtualenvwrapper.sh)";
   if [ -z "$virtualenvwrapper_script" ]; then
@@ -171,5 +171,5 @@ fi
 # Automatically activate the virtual env unless this
 # behaviour is suppressed by specifying the env var
 if [[ "$PROJECT_VIRTUALENV_AUTO_ACTIVATE" != "0" ]]; then
-  setup_virtual_env;
+  project_setup_virtual_env;
 fi