Prepare for execution in Python venv (#85)

* Add workaround fix for non-reactive Databroker CLI
eclipse-velocitas · Sep 4, 2024 · c4f918e · c4f918e
1 parent cf8df27
commit c4f918e
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 19 deletions.
diff --git a/desired_state_generator/src/requirements.txt b/desired_state_generator/src/requirements.txt
@@ -1 +1 @@
-velocitas-lib==0.0.11
+velocitas-lib==0.0.12
diff --git a/manifest.json b/manifest.json
@@ -6,8 +6,19 @@
             "type": "runtime",
             "programs": [
                 {
-                    "id": "run-vehicledatabroker-cli",
+                    "id": "install-deps",
                     "executable": "python3",
+                    "args": [
+                        "-m",
+                        "pip",
+                        "install",
+                        "-r",
+                        "./runtime_local/src/requirements.txt"
+                    ]
+                },
+                {
+                    "id": "run-vehicledatabroker-cli",
+                    "executable": "/usr/bin/python3",
                     "args": [
                         "./runtime_local/src/run-vehicledatabroker-cli.py"
                     ],
@@ -34,17 +45,6 @@
                         "./runtime_local/src/runtime-down.py"
                     ]
                 },
-                {
-                    "id": "install-deps",
-                    "executable": "python3",
-                    "args": [
-                        "-m",
-                        "pip",
-                        "install",
-                        "-r",
-                        "./runtime_local/src/requirements.txt"
-                    ]
-                },
                 {
                     "id": "run-vehicle-app",
                     "executable": "python3",
@@ -195,6 +195,17 @@
             "alias": "kanto",
             "type": "deployment",
             "programs": [
+                {
+                    "id": "install-deps",
+                    "executable": "python3",
+                    "args": [
+                        "-m",
+                        "pip",
+                        "install",
+                        "-r",
+                        "./runtime_kanto/src/requirements.txt"
+                    ]
+                },
                 {
                     "id": "build-vehicleapp",
                     "executable": "python3",
@@ -210,6 +221,11 @@
                     ]
                 }
             ],
+            "onPostInit": [
+                {
+                    "ref": "install-deps"
+                }
+            ],
             "variables": [
                 {
                     "name": "dockerfilePath",

diff --git a/runtime_kanto/src/requirements.txt b/runtime_kanto/src/requirements.txt
@@ -1,2 +1,2 @@
 yaspin==2.3.0
-velocitas-lib==0.0.11
+velocitas-lib==0.0.12
diff --git a/runtime_kanto/test/requirements.txt b/runtime_kanto/test/requirements.txt
@@ -2,4 +2,4 @@ pytest==7.2.1
 pytest-ordering==0.6
 pytest-asyncio==0.20.3
 pytest-cov==4.0.0
-velocitas-lib==0.0.11
+velocitas-lib==0.0.12
diff --git a/runtime_local/src/requirements.txt b/runtime_local/src/requirements.txt
@@ -1,2 +1,2 @@
 yaspin==2.3.0
-velocitas-lib==0.0.11
+velocitas-lib==0.0.12
diff --git a/runtime_local/src/run-vehicledatabroker-cli.py b/runtime_local/src/run-vehicledatabroker-cli.py
@@ -12,10 +12,40 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# Workaround fix begin: Databroker CLI is not reactive if started via CLI in Python venv.
+# Bug ticket: https://github.com/eclipse-velocitas/cli/issues/320
+# With this fix in this file only standard libs are used avoiding the need for a venv.
+
+# from local_lib import get_container_runtime_executable
+# from velocitas_lib import require_env
+import os
 import subprocess
 
-from local_lib import get_container_runtime_executable
-from velocitas_lib import require_env
+
+def require_env(name: str) -> str:
+    """Require and return an environment variable.
+
+    Args:
+        name (str): The name of the variable.
+
+    Raises:
+        ValueError: In case the environment variable is not set.
+
+    Returns:
+        str: The value of the variable.
+    """
+    var = os.getenv(name)
+    if not var:
+        raise ValueError(f"Environment variable {name!r} not set!")
+    return var
+
+
+def get_container_runtime_executable() -> str:
+    """Return the current container runtime executable. E.g. docker."""
+    return "docker"
+
+
+# Workaround fix end: Databroker CLI is not reactive if started via CLI in Python venv
 
 
 def run_databroker_cli():

diff --git a/runtime_local/test/requirements.txt b/runtime_local/test/requirements.txt
@@ -1,3 +1,3 @@
 pytest==7.2.1
 pytest-cov==4.0.0
-velocitas-lib==0.0.11
+velocitas-lib==0.0.12