From e97a649c21a073846ba593981253a48a27cd2a4e Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Tue, 25 Jun 2019 15:13:56 +0200 Subject: [PATCH] Remove temporary workaround for python3-lttng --- docker-ci-base/Dockerfile | 4 ++++ tracetools_trace/tracetools_trace/tools/lttng.py | 14 ++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/docker-ci-base/Dockerfile b/docker-ci-base/Dockerfile index 77e45a7..6497f35 100644 --- a/docker-ci-base/Dockerfile +++ b/docker-ci-base/Dockerfile @@ -1,10 +1,14 @@ FROM ros:dashing-ros-base-bionic RUN apt-get update + RUN apt-get install --no-install-recommends -y \ libasio-dev \ libtinyxml2-dev +RUN apt-get install -y software-properties-common +RUN apt-add-repository -y ppa:lttng/ppa +RUN apt-get update RUN apt-get install -y \ python3-lttng \ python3-babeltrace diff --git a/tracetools_trace/tracetools_trace/tools/lttng.py b/tracetools_trace/tracetools_trace/tools/lttng.py index 25dd47c..d715d61 100644 --- a/tracetools_trace/tracetools_trace/tools/lttng.py +++ b/tracetools_trace/tracetools_trace/tools/lttng.py @@ -14,19 +14,13 @@ """Interface for tracing with LTTng.""" -import sys from typing import List -# Temporary workaround -sys.path = ['/usr/local/lib/python3.6/site-packages'] + sys.path +import lttng -import lttng # noqa: E402 - -from .names import ( # noqa: E402 - DEFAULT_CONTEXT, - DEFAULT_EVENTS_KERNEL, - DEFAULT_EVENTS_ROS, -) +from .names import DEFAULT_CONTEXT +from .names import DEFAULT_EVENTS_KERNEL +from .names import DEFAULT_EVENTS_ROS def lttng_init(