niklas/tracetools_analysis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '24-restore-dependency-on-python3-pandas' into 'master'

Browse source 
Restore dependency on python3-pandas and re-enable tests

Closes #24

See merge request micro-ROS/ros_tracing/tracetools_analysis!56
This commit is contained in:
Christophe Bedard 2020-03-08 21:07:08 +00:00
commit 7d6c51ae04
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -23,6 +23,6 @@ build:
- . /root/ws/install/local_setup.sh - . /root/ws/install/local_setup.sh
script: script:
- colcon build --symlink-install --event-handlers console_cohesion+ --packages-up-to $PACKAGES_LIST - 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 - colcon test-result --all
<<: *global_artifacts <<: *global_artifacts

2
tracetools_analysis/package.xml
View file

@ -11,7 +11,7 @@
<author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author> <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
<depend>tracetools_read</depend> <depend>tracetools_read</depend>
<!-- <depend>python3-pandas</depend> --> <depend>python3-pandas</depend>
<test_depend>ament_copyright</test_depend> <test_depend>ament_copyright</test_depend>
<test_depend>ament_flake8</test_depend> <test_depend>ament_flake8</test_depend>

2
tracetools_analysis/setup.cfg
View file

@ -2,5 +2,3 @@
script-dir=$base/lib/tracetools_analysis script-dir=$base/lib/tracetools_analysis
[install] [install]
install-scripts=$base/lib/tracetools_analysis install-scripts=$base/lib/tracetools_analysis
[tool:pytest]
addopts = --ignore=test/tracetools_analysis/