Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Nov 5, 2025

Description

Part of robograph-project/planning#38

Makes the two Substitutions that return a directory into a subclass of PathSubstitution

  • LaunchLogDir
  • ThisLaunchFileDir

So that one can immediately use the path join operator / with them.

Allows changing:

PathSubstitution(ThisLaunchFileDir()) / 'my_launch.py'
# or
PathJoinSubstitution([ThisLaunchFileDir(), 'my_launch.py'])

into

ThisLaunchFileDir() / 'my_launch.py'

Is this user-facing behavior change?

New user-facing capability, no existing usage changed.

Did you use Generative AI?

No

Additional Information


This is an automatic backport of pull request #914 done by [Mergify](https://mergify.com).

…/ operator (#914)

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
(cherry picked from commit 0d54476)

# Conflicts:
#	launch/launch/substitutions/launch_log_dir.py
@mergify mergify bot added the conflicts label Nov 5, 2025
@mergify
Copy link
Author

mergify bot commented Nov 5, 2025

Cherry-pick of 0d54476 has failed:

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

You are currently cherry-picking commit 0d54476.
  (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:   launch/launch/substitutions/this_launch_file_dir.py
	modified:   launch/test/launch/substitutions/test_launch_log_dir.py
	modified:   launch/test/launch/substitutions/test_this_launch_file_dir.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   launch/launch/substitutions/launch_log_dir.py

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

@emersonknapp emersonknapp changed the title Make the directory-finding substitutions into a PathSubstitution for / operator (backport #914) [backport kilted] Make the directory-finding substitutions into a PathSubstitution for / operator (backport #914) Nov 6, 2025
@emersonknapp emersonknapp moved this to In review in ROSGraph Planning Nov 6, 2025
@emersonknapp emersonknapp self-assigned this Nov 6, 2025
@ahcorde
Copy link
Contributor

ahcorde commented Nov 6, 2025

Pulls: #919, ros2/launch_ros#498
Gist: https://gist.githubusercontent.com/ahcorde/d28cf19408b963f82bce1fe11fffa342/raw/c113be24e92aa5d5d817a9daf9a9f4e2b554a488/ros2.repos
BUILD args: --packages-above-and-dependencies launch_ros test_launch_ros launch
TEST args: --packages-above launch_ros test_launch_ros launch
ROS Distro: kilted
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/17403

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

@ahcorde ahcorde merged commit 748aadf into kilted Nov 6, 2025
2 of 3 checks passed
@github-project-automation github-project-automation bot moved this from In review to Done in ROSGraph Planning Nov 6, 2025
@ahcorde ahcorde deleted the mergify/bp/kilted/pr-914 branch November 6, 2025 15:23
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