From 4087fe9ebabbc7afb323c68886f1ceeb881e21a1 Mon Sep 17 00:00:00 2001 From: Niklas Halle Date: Tue, 29 Apr 2025 10:23:56 +0200 Subject: [PATCH] tmp remove subgit --- .gitmodules | 6 ------ Dockerfile | 6 +++++- src/tools/ros2_tracing | 1 - src/tools/tracetools_analysis | 1 - 4 files changed, 5 insertions(+), 9 deletions(-) delete mode 160000 src/tools/ros2_tracing delete mode 160000 src/tools/tracetools_analysis diff --git a/.gitmodules b/.gitmodules index 75501e7..94484d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ [submodule "src/ros_edf"] path = src/ros_edf url = git@git.niklashalle.net:niklas/ROS-Dynamic-Executor.git -[submodule "src/tools/ros2_tracing"] - path = src/tools/ros2_tracing - url = git@gitlab.com:ros-tracing/ros2_tracing.git -[submodule "src/tools/tracetools_analysis"] - path = src/tools/tracetools_analysis - url = git@gitlab.com:ros-tracing/tracetools_analysis.git diff --git a/Dockerfile b/Dockerfile index 9c7a865..52c6cfd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -83,7 +83,11 @@ RUN python3 -m pip install --upgrade jupyterlab # Install dependencies for ros2_tracing RUN apt-get update -q && \ apt-get install -y lttng-tools lttng-modules-dkms liblttng-ust-dev -RUN apt-get install -y python3-babeltrace python3-lttng python3-pytest +RUN apt-get install -y python3-babeltrace python3-lttng python3-pytest python3-pandas + +# Python bokeh is not available in the default apt repository +# So we install it using pip +RUN python3 -m pip install --upgrade bokeh # Add user to the "tracing" group RUN usermod -aG tracing $USERNAME diff --git a/src/tools/ros2_tracing b/src/tools/ros2_tracing deleted file mode 160000 index 449a012..0000000 --- a/src/tools/ros2_tracing +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 449a0123fd12032519ca6bea2209cc0505304771 diff --git a/src/tools/tracetools_analysis b/src/tools/tracetools_analysis deleted file mode 160000 index 1857797..0000000 --- a/src/tools/tracetools_analysis +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 18577974cf842b4f35bf0d22611695dcddb30f6d