Merge sdf15 ➡️ main #1560
Merged
Merge sdf15 ➡️ main #1560
+5
−11
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Remove unneeded check for python3 from sdf folder We already require Python3, so remove the check and build error from sdf/CMakeLists.txt * Fix check for psutil python package Search for python psutil package even if BUILD_TESTING is not set and move error message to the place where the memory leak test is disabled if the package is missing. This is needed because the BUILD_TESTING variable is not defined until after gz_configure_build. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
83 tasks
ahcorde
approved these changes
Apr 28, 2025
iche033
approved these changes
Apr 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
➡️ Forward port
Port
sdf15➡️mainBranch comparison: main...sdf15
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)