Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions patch/ros-rolling-ros2cli.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/ros2cli/completion/ros2-argcomplete.zsh b/ros2cli/completion/ros2-argcomplete.zsh
index b9fc309..14279de 100644
--- a/ros2cli/completion/ros2-argcomplete.zsh
+++ b/ros2cli/completion/ros2-argcomplete.zsh
@@ -20,6 +20,6 @@ autoload -U +X bashcompinit && bashcompinit
# Get this scripts directory
__ros2cli_completion_dir=${0:a:h}
# Just source the bash version, it works in zsh too
-source "$__ros2cli_completion_dir/ros2-argcomplete.bash"
+source "$CONDA_PREFIX/share/bash-completion/completions/ros2-argcomplete.bash"
# Cleanup
unset __ros2cli_completion_dir
diff --git a/ros2cli/setup.py b/ros2cli/setup.py
index 458010c..c08d015 100644
--- a/ros2cli/setup.py
+++ b/ros2cli/setup.py
@@ -24,6 +24,17 @@ setup(
'completion/ros2-argcomplete.fish',
'completion/ros2-argcomplete.zsh',
]),
+
+ # [pixi] install autocompletion scripts
+ ('share/bash-completion/completions', [
+ 'completion/ros2-argcomplete.bash',
+ ]),
+ ('share/zsh/site-functions', [
+ 'completion/ros2-argcomplete.zsh',
+ ]),
+ ('share/fish/vendor_completions.d', [
+ 'completion/ros2-argcomplete.fish',
+ ]),
],
package_data={'': ['py.typed']},
zip_safe=False,
31 changes: 31 additions & 0 deletions patch/ros-rolling-rosidl.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/rosidl_cli/completion/rosidl-argcomplete.zsh b/rosidl_cli/completion/rosidl-argcomplete.zsh
index 9a86dbd..a33f8e1 100644
--- a/rosidl_cli/completion/rosidl-argcomplete.zsh
+++ b/rosidl_cli/completion/rosidl-argcomplete.zsh
@@ -18,6 +18,6 @@ autoload -U +X bashcompinit && bashcompinit
# Get this scripts directory
__rosidl_cli_completion_dir=${0:a:h}
# Just source the bash version, it works in zsh too
-source "$__rosidl_cli_completion_dir/rosidl-argcomplete.bash"
+source "$CONDA_PREFIX/share/bash-completion/completions/rosidl-argcomplete.bash"
# Cleanup
unset __rosidl_cli_completion_dir
diff --git a/rosidl_cli/setup.py b/rosidl_cli/setup.py
index 7b41f65..36a71b3 100644
--- a/rosidl_cli/setup.py
+++ b/rosidl_cli/setup.py
@@ -23,6 +23,14 @@ setup(
'completion/rosidl-argcomplete.bash',
'completion/rosidl-argcomplete.zsh'
]),
+
+ # [pixi] install autocompletion scripts
+ ('share/bash-completion/completions', [
+ 'completion/rosidl-argcomplete.bash',
+ ]),
+ ('share/zsh/site-functions', [
+ 'completion/rosidl-argcomplete.zsh'
+ ]),
],
package_data={'': ['py.typed']},
zip_safe=False,
4 changes: 4 additions & 0 deletions pkg_additional_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -231,3 +231,7 @@ visp:
override_version: '3.6.0'
zenoh_cpp_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK -DUSE_SYSTEM_ZENOH=ON"
ros2cli:
build_number: 26
rosidl_cli:
build_number: 26
8 changes: 8 additions & 0 deletions tests/ros-rolling-ros2cli.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
tests:
# Regression test for https://github.com/RoboStack/ros-humble/issues/271
- script:
- if: unix
then:
- test -f ${PREFIX}/share/bash-completion/completions/ros2-argcomplete.bash
- test -f ${PREFIX}/share/zsh/site-functions/ros2-argcomplete.zsh
- test -f ${PREFIX}/share/fish/vendor_completions.d/ros2-argcomplete.fish
7 changes: 7 additions & 0 deletions tests/ros-rolling-rosidl.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
tests:
# Regression test for https://github.com/RoboStack/ros-humble/issues/271
- script:
- if: unix
then:
- test -f ${PREFIX}/share/bash-completion/completions/rosidl-argcomplete.bash
- test -f ${PREFIX}/share/zsh/site-functions/rosidl-argcomplete.zsh
2 changes: 1 addition & 1 deletion vinca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ conda_index:
- robostack.yaml
- packages-ignore.yaml

# Reminder for next full rebuild, the next build number should be 26
# Reminder for next full rebuild, the next build number should be 27
build_number: 25

mutex_package:
Expand Down
Loading