-
Notifications
You must be signed in to change notification settings - Fork 98
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
Fix find Python3 logic and macOS workflow #1367
Merged
Merged
Conversation
This file contains 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
Adapt the approach from gz-sim. Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1367 +/- ##
=======================================
Coverage 92.41% 92.41%
=======================================
Files 134 134
Lines 17669 17669
=======================================
Hits 16328 16328
Misses 1341 1341 ☔ View full report in Codecov by Sentry. |
caguero
approved these changes
Jan 31, 2024
scpeters
added a commit
that referenced
this pull request
Jan 31, 2024
* Find Python3 with find_package instead of GzPython, adapting the approach from gz-sim. * macos workflow: use brew --prefix, not /usr/local * macos workflow: set Python3_EXECUTABLE cmake var Signed-off-by: Steve Peters <[email protected]>
scpeters
added a commit
that referenced
this pull request
Jan 31, 2024
* Find Python3 with find_package instead of GzPython, adapting the approach from gz-sim. * macos workflow: use brew --prefix, not /usr/local * macos workflow: set Python3_EXECUTABLE cmake var Signed-off-by: Steve Peters <[email protected]>
scpeters
added a commit
that referenced
this pull request
Feb 2, 2024
* Find Python3 with find_package instead of GzPython, adapting the approach from gz-sim. * macos workflow: use brew --prefix, not /usr/local * macos workflow: set Python3_EXECUTABLE cmake var Signed-off-by: Steve Peters <[email protected]>
scpeters
added a commit
that referenced
this pull request
Jun 24, 2024
* Find Python3 with find_package instead of GzPython, adapting the approach from gz-sim. Signed-off-by: Steve Peters <[email protected]>
azeey
pushed a commit
that referenced
this pull request
Jul 2, 2024
* macos workflow: use brew --prefix, not /usr/local * macos workflow: set Python3_EXECUTABLE cmake var Signed-off-by: Steve Peters <[email protected]>
azeey
pushed a commit
that referenced
this pull request
Jul 2, 2024
* macos workflow: use brew --prefix, not /usr/local * macos workflow: set Python3_EXECUTABLE cmake var Signed-off-by: Steve Peters <[email protected]>
scpeters
added a commit
that referenced
this pull request
Jul 2, 2024
* macos workflow: use brew --prefix, not /usr/local * macos workflow: set Python3_EXECUTABLE cmake var Partial backport of #1367. Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Steve Peters <[email protected]>
scpeters
added a commit
that referenced
this pull request
Jul 2, 2024
* macos workflow: use brew --prefix, not /usr/local * macos workflow: set Python3_EXECUTABLE cmake var Partial backport of #1367. Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Steve Peters <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
🦟 Bug fix
Follow-up to gazebosim/gz-sim#2249 and osrf/homebrew-simulation#2545
Summary
The homebrew formula for
sdformat15
was updated in osrf/homebrew-simulation#2545 to explicitly set thePython3_EXECUTABLE
cmake variable. This works when buildingsdformat15
on its own (), but it fails when buildingsdformat15
from source as a dependency ofgz-physics8
() due to the presence of an additional python version on the system.This pull request changes the logic for finding python and moves it earlier. It's mostly based on the approach in gz-sim with the following changes:
Embedded.cc
file, so find the Python3 Interpreter asREQUIRED
even ifSKIP_PYBIND11
is set. When bindings are not skipped, findDevelopment
as an optional component to preserve existing behavior that just warns if it is unable to build bindings. I've tested this with osrf/homebrew-simulation@3a5b29e usingci_matching_branch/
and it fixes thesdformat15
build as a dependency ofgz-physics8
().I've targeted
main
since it's easiest to confirm the failure and fix using these CI jobs, and I'll backport once this is merged.Checklist
codecheck
passed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-by
messages.