From 60d46b12c8d901e2fbba07637efe66bc08bc1487 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <christophe.bedard@apex.ai>
Date: Wed, 16 Oct 2019 08:38:49 -0700
Subject: [PATCH 1/3] Revert "Remove pandas dependency"

This reverts commit fdf84d36073a75d47f6ed813282d2da413ce981e.

Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
---
 tracetools_analysis/package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tracetools_analysis/package.xml b/tracetools_analysis/package.xml
index d9145b7..d301ba3 100644
--- a/tracetools_analysis/package.xml
+++ b/tracetools_analysis/package.xml
@@ -11,7 +11,7 @@
   <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
 
   <depend>tracetools_read</depend>
-  <!-- <depend>python3-pandas</depend> -->
+  <depend>python3-pandas</depend>
 
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>

From 3087e62451197026a7eb74339e4deb2e7a7147d2 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <fixed-term.christophe.bourquebedard@de.bosch.com>
Date: Thu, 15 Aug 2019 11:16:05 +0200
Subject: [PATCH 2/3] Revert "Ignore tracetools_analysis-specific tests for
 now"

This reverts commit 8d4d6ca6adb6511b9619d286e0f12999906048d6.

Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
---
 tracetools_analysis/setup.cfg | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tracetools_analysis/setup.cfg b/tracetools_analysis/setup.cfg
index c4be5a8..721ff12 100644
--- a/tracetools_analysis/setup.cfg
+++ b/tracetools_analysis/setup.cfg
@@ -2,5 +2,3 @@
 script-dir=$base/lib/tracetools_analysis
 [install]
 install-scripts=$base/lib/tracetools_analysis
-[tool:pytest]
-addopts = --ignore=test/tracetools_analysis/

From fa8d92b03f1672e93d644bc659614a7bdc1f7927 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <bedard.christophe@gmail.com>
Date: Sun, 8 Mar 2020 17:03:32 -0400
Subject: [PATCH 3/3] Remove pytest test options overriding in CI config

Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb36794..c995575 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,6 @@ build:
     - . /root/ws/install/local_setup.sh
   script:
     - colcon build --symlink-install --event-handlers console_cohesion+ --packages-up-to $PACKAGES_LIST
-    - colcon test --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST --pytest-args -o addopts=
+    - colcon test --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST
     - colcon test-result --all
   <<: *global_artifacts