Merge branch 'fix-python3-lttng' into 'master'

Use fixed python3-lttng and remove temporary workaround

See merge request ros_tracing/ros2_tracing!26
This commit is contained in:
Christophe Bedard 2019-06-25 13:34:37 +00:00
commit ae5386a83d
2 changed files with 8 additions and 10 deletions

View file

@ -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

View file

@ -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(