Skip to content

[humble] Remove explicit sqlite3 from code (backport #1166) #1723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 23, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 22, 2024

Removes all code mentions of "sqlite3" from packages

  • rosbag2_cpp
  • rosbag2_performance_benchmarking
  • rosbag2_py
  • rosbag2_storage
  • rosbag2_transport

rosbag2_tests and the CLI/README will be in separate PRs


This is an automatic backport of pull request #1166 done by Mergify.

@mergify mergify bot added the conflicts label Jun 22, 2024
@mergify mergify bot requested a review from a team as a code owner June 22, 2024 19:05
Copy link
Author

mergify bot commented Jun 22, 2024

Cherry-pick of 3300a27 has failed:

On branch mergify/bp/humble/pr-1166
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 3300a27.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   rosbag2_cpp/include/rosbag2_cpp/reader.hpp
	modified:   rosbag2_cpp/include/rosbag2_cpp/writer.hpp
	modified:   rosbag2_performance/rosbag2_performance_benchmarking/src/config_utils.cpp
	modified:   rosbag2_performance/rosbag2_performance_benchmarking/src/writer_benchmark.cpp
	modified:   rosbag2_py/test/common.py
	modified:   rosbag2_py/test/test_convert.py
	modified:   rosbag2_storage/test/rosbag2_storage/test_metadata_serialization.cpp
	modified:   rosbag2_transport/test/rosbag2_transport/test_play_seek.cpp
	modified:   rosbag2_transport/test/rosbag2_transport/test_rewrite.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rosbag2_cpp/test/rosbag2_cpp/test_info.cpp
	both modified:   rosbag2_cpp/test/rosbag2_cpp/test_sequential_reader.cpp
	both modified:   rosbag2_cpp/test/rosbag2_cpp/test_sequential_writer.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested review from gbiggs and hidmic and removed request for a team June 22, 2024 19:06
@MichaelOrlov MichaelOrlov changed the title Remove explicit sqlite3 from code (backport #1166) [humble] Remove explicit sqlite3 from code (backport #1166) Jun 22, 2024
emersonknapp and others added 2 commits June 22, 2024 16:46
* Remove explicit sqlite3 from code

Removes all code mentions of "sqlite3" from packages
* rosbag2_cpp
* rosbag2_performance_benchmarking
* rosbag2_py
* rosbag2_storage
* rosbag2_transport

`rosbag2_tests` and the CLI/README will be in separate PRs

Signed-off-by: Emerson Knapp <[email protected]>
(cherry picked from commit 3300a27)

# Conflicts:
#	rosbag2_cpp/test/rosbag2_cpp/test_info.cpp
#	rosbag2_cpp/test/rosbag2_cpp/test_sequential_reader.cpp
#	rosbag2_cpp/test/rosbag2_cpp/test_sequential_writer.cpp
- Shall be applied above backport of the #1146. Due to missing
`default_storage_id.hpp`

Signed-off-by: Michael Orlov <[email protected]>
@MichaelOrlov MichaelOrlov force-pushed the mergify/bp/humble/pr-1166 branch from 031e1f1 to 1746b17 Compare June 23, 2024 00:17
@MichaelOrlov
Copy link
Contributor

Note: There are no API/ABI breaking changes, therefore it is ok to merge it on humble.

@MichaelOrlov
Copy link
Contributor

Pulls: #1723
Gist: https://gist.githubusercontent.com/MichaelOrlov/58028ab7f01e3ec2e20c6c617f7e951d/raw/7a94f21492a22b8a53b83a4bfe3f6b714ef9e462/ros2.repos
BUILD args: --packages-above-and-dependencies rosbag2_cpp rosbag2_py rosbag2_storage rosbag2_performance_benchmarking
TEST args: --packages-above rosbag2_cpp rosbag2_py rosbag2_storage rosbag2_performance_benchmarking
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14113

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@MichaelOrlov MichaelOrlov merged commit ca07426 into humble Jun 23, 2024
@mergify mergify bot deleted the mergify/bp/humble/pr-1166 branch June 23, 2024 02:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants