Skip to content

In setuptools packages, install everything in launch directory (backport #5156) #5172

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
Mar 25, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 25, 2025

Part of #5143

Instead of using "clever" glob pattern to match launch.xml, launch.yaml, launch.py - just copy what we already recommend for CMake packages, and install everything from launch/ directory. Benefit of consistency between package types, and potentially leaving the door open for other launch suffixes/frontends.

(also, make our usage of glob consistent across the repo - we were some places using os.path.join inside it, and sometimes not. I opted for the simpler syntax)


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

Signed-off-by: Emerson Knapp <[email protected]>
Signed-off-by: Emerson Knapp <[email protected]>
Co-authored-by: Christophe Bedard <[email protected]>
(cherry picked from commit d002d60)

# Conflicts:
#	source/How-To-Guides/Developing-a-ROS-2-Package.rst
#	source/Tutorials/Intermediate/Launch/Using-ROS2-Launch-For-Large-Projects.rst
@mergify mergify bot added the conflicts label Mar 25, 2025
Copy link
Contributor Author

mergify bot commented Mar 25, 2025

Cherry-pick of d002d60 has failed:

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

You are currently cherry-picking commit d002d60.
  (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:   source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-Python.rst
	modified:   source/Tutorials/Intermediate/Launch/Launch-system.rst
	modified:   source/Tutorials/Intermediate/Launch/Using-Substitutions.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Broadcaster-Py.rst
	modified:   source/Tutorials/Intermediate/URDF/Using-URDF-with-Robot-State-Publisher-py.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   source/How-To-Guides/Developing-a-ROS-2-Package.rst
	both modified:   source/Tutorials/Intermediate/Launch/Using-ROS2-Launch-For-Large-Projects.rst

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

Use incoming changes.

Signed-off-by: Christophe Bedard <[email protected]>
Copy link

HTML artifacts: https://github.com/ros2/ros2_documentation/actions/runs/14065047042/artifacts/2817362914.

To view the resulting site:

  1. Click on the above link to download the artifacts archive
  2. Extract it
  3. Open html-artifacts-5172/index.html in your favorite browser

@christophebedard christophebedard merged commit 004b205 into humble Mar 25, 2025
5 checks passed
@christophebedard christophebedard deleted the mergify/bp/humble/pr-5156 branch March 25, 2025 16:35
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.

2 participants