continue debugging workflow 24

kinode-dao · Sep 11, 2024 · d73c6d6 · d73c6d6
1 parent d399f35
commit d73c6d6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/code/ws_client/requirements.sh b/code/ws_client/requirements.sh
@@ -23,10 +23,11 @@ fi
 python -m pip install --upgrade pip
 
 # Install packages from the requirements.txt file.
-if [ -f "requirements.txt" ]; then
+script_dir=$(dirname "$(crossplatform_realpath "${BASH_SOURCE[0]}")")
+requirements_path = "${script_dir}/requirements.txt"
+if [ -f "$requirements_path" ]; then
     echo "Installing packages from requirements.txt..."
-    script_dir=$(dirname "$(crossplatform_realpath "${BASH_SOURCE[0]}")")
-    pip install -r ${script_dir}/requirements.txt
+    pip install -r $requirements_path
 else
     echo "Error: requirements.txt does not exist."
     exit 0

diff --git a/code/ws_client/test/tests.toml b/code/ws_client/test/tests.toml
@@ -10,8 +10,7 @@ setup_packages = [
     { path = "..", run = false }
 ]
 setup_scripts = [
-    { path = "ws_server/requirements.sh", args = "" },
-    { path = "../ws_server.py", args = "" }
+    { path = "../requirements.sh && ../ws_server.py", args = "" }
 ]
 test_package_paths = ["ws_client_test"]
 test_scripts = []

diff --git a/code/ws_server/requirements.sh b/code/ws_server/requirements.sh
@@ -23,10 +23,11 @@ fi
 python -m pip install --upgrade pip
 
 # Install packages from the requirements.txt file.
-if [ -f "requirements.txt" ]; then
+script_dir=$(dirname "$(crossplatform_realpath "${BASH_SOURCE[0]}")")
+requirements_path = "${script_dir}/requirements.txt"
+if [ -f "$requirements_path" ]; then
     echo "Installing packages from requirements.txt..."
-    script_dir=$(dirname "$(crossplatform_realpath "${BASH_SOURCE[0]}")")
-    pip install -r ${script_dir}/requirements.txt
+    pip install -r $requirements_path
 else
     echo "Error: requirements.txt does not exist."
     exit 0

diff --git a/code/ws_server/test/tests.toml b/code/ws_server/test/tests.toml
@@ -9,11 +9,11 @@ dependency_package_paths = []
 setup_packages = [
     { path = "..", run = true }
 ]
-setup_scripts = [
-    { path = "ws_server/requirements.sh", args = "" }
-]
+setup_scripts = []
 test_package_paths = []
-test_scripts = [{ path = "../ws_client.py", args = "" }]
+test_scripts = [
+    { path = "../requirements.sh && ../ws_client.py", args = "" }
+]
 timeout_secs = 5
 fakechain_router = 8545
 

diff --git a/code/ws_server_with_reply/requirements.sh b/code/ws_server_with_reply/requirements.sh
@@ -23,10 +23,11 @@ fi
 python -m pip install --upgrade pip
 
 # Install packages from the requirements.txt file.
-if [ -f "requirements.txt" ]; then
+script_dir=$(dirname "$(crossplatform_realpath "${BASH_SOURCE[0]}")")
+requirements_path = "${script_dir}/requirements.txt"
+if [ -f "$requirements_path" ]; then
     echo "Installing packages from requirements.txt..."
-    script_dir=$(dirname "$(crossplatform_realpath "${BASH_SOURCE[0]}")")
-    pip install -r ${script_dir}/requirements.txt
+    pip install -r $requirements_path
 else
     echo "Error: requirements.txt does not exist."
     exit 0

diff --git a/code/ws_server_with_reply/test/tests.toml b/code/ws_server_with_reply/test/tests.toml
@@ -9,11 +9,11 @@ dependency_package_paths = []
 setup_packages = [
     { path = "..", run = true }
 ]
-setup_scripts = [
-    { path = "ws_server/requirements.sh", args = "" }
-]
+setup_scripts = []
 test_package_paths = []
-test_scripts = [{ path = "../ws_client.py", args = "" }]
+test_scripts = [
+    { path = "../requirements.sh && ../ws_client.py", args = "" }
+]
 timeout_secs = 5
 fakechain_router = 8545