Skip to content

Commit c87ed6c

Browse files
TimpleTimple
committed
Merge branch 'main' into auto-sort
2 parents 16a0d0e + 894c334 commit c87ed6c

235 files changed

Lines changed: 12988 additions & 6789 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/testpr.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44

55
env:
66
ROS_VERSION: 2
7+
PYTHONIOENCODING: utf-8
78
# Change to 'true' to enable the cache upload as artifacts
89
SAVE_CACHE_AS_ARTIFACT: 'true'
910
# Change to 'true' to ignore cache and force a full rebuild, but please restore to 'false' before merging
@@ -101,7 +102,7 @@ jobs:
101102
- name: Delete specific outdated cache entries
102103
shell: bash -l {0}
103104
run: |
104-
# rm -rf ${{ matrix.folder_cache }}/ros-kilted-rosx* 2>/dev/null || true
105+
# rm -rf ${{ matrix.folder_cache }}/ros-rolling-moveit-ros-perception* 2>/dev/null || true
105106
mkdir -p ${{ matrix.folder_cache }}
106107
pixi run rattler-index fs ${{ matrix.folder_cache }}/.. --force
107108
@@ -113,7 +114,7 @@ jobs:
113114
- name: Build recipes
114115
shell: bash -l {0}
115116
run: |
116-
pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c conda-forge -c robostack-kilted --skip-existing
117+
pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c https://prefix.dev/conda-forge -c https://prefix.dev/robostack-rolling --skip-existing
117118
118119
- name: See packages that will be saved in cache
119120
shell: bash -l {0}

‎.scripts/build_unix.sh‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,23 @@ for recipe in ${CURRENT_RECIPES[@]}; do
4040
pixi run -v rattler-build build \
4141
--recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \
4242
-m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \
43-
-c robostack-kilted -c conda-forge \
43+
-c https://prefix.dev/robostack-rolling -c https://prefix.dev/conda-forge \
4444
${extra_channel} \
4545
--output-dir $CONDA_BLD_PATH \
4646
${cross_compile}
4747
# -m ${FEEDSTOCK_ROOT}/.ci_support/conda_forge_pinnings.yaml \
4848

4949
done
5050

51-
# Check if it build something, this is a hotfix for the skips inside additional_recipes
52-
if compgen -G "${CONDA_BLD_PATH}/${target}*/*.conda" > /dev/null; then
53-
pixi run upload "${CONDA_BLD_PATH}/${target}"*/*.conda --force
51+
# Check if it build something, this is a hotfix for the skips inside additional_recipes
52+
shopt -s nullglob
53+
conda_packages=( "${CONDA_BLD_PATH}/${target}"*/*.conda )
54+
if (( ${#conda_packages[@]} > 0 )); then
55+
# Upload packages one-by-one to avoid rattler-upload returning after the first
56+
# package skipped by --skip-existing.
57+
for conda_package in "${conda_packages[@]}"; do
58+
pixi run upload "${conda_package}" --skip-existing
59+
done
5460
else
5561
echo "Warning: No .conda files found in ${CONDA_BLD_PATH}/${target}"
5662
echo "This might be due to all the packages being skipped"

‎.scripts/build_win.bat‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ for %%X in (%CURRENT_RECIPES%) do (
1818
cd %FEEDSTOCK_ROOT%\recipes\%%X\
1919
pixi run -v rattler-build build --recipe %FEEDSTOCK_ROOT%\recipes\%%X\ ^
2020
-m %FEEDSTOCK_ROOT%\conda_build_config.yaml ^
21-
-c robostack-kilted -c conda-forge ^
21+
-c https://prefix.dev/robostack-rolling -c https://prefix.dev/conda-forge ^
2222
--output-dir %CONDA_BLD_PATH%
2323

2424
if errorlevel 1 exit 1
@@ -28,9 +28,11 @@ for %%X in (%CURRENT_RECIPES%) do (
2828
:: Check if .conda files exist in the win-64 directory
2929
if exist "%CONDA_BLD_PATH%\win-64\*.conda" (
3030
echo Found .conda files, starting upload...
31+
rem Upload packages one-by-one to avoid rattler-upload returning after the first
32+
rem package skipped by --skip-existing.
3133
for %%F in ("%CONDA_BLD_PATH%\win-64\*.conda") do (
32-
echo Uploading %%F
33-
pixi run upload "%%F" --force
34+
echo Uploading %%~fF
35+
pixi run upload "%%~fF" --skip-existing
3436
if errorlevel 1 exit 1
3537
)
3638
) else (

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# AGENTS.md
22

3-
Working notes for future coding agents in a RoboStack repo. Replace $DISTRO with e.g. noetic/humble/kilted and so forth; you can check the working directory.
3+
Working notes for future coding agents in a RoboStack repo. Replace $DISTRO with e.g. noetic/humble/kilted/rolling and so forth; you can check the working directory.
44

55
## Session defaults for this repo
66

‎README.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
# RoboStack (for ROS kilted)
1+
# RoboStack (for ROS rolling)
22

3-
[![Conda](https://img.shields.io/conda/dn/robostack-kilted/ros-kilted-desktop?style=flat-square)](https://anaconda.org/robostack/)
4-
[![GitHub Repo stars](https://img.shields.io/github/stars/robostack/ros-kilted?style=flat-square)](https://github.com/RoboStack/ros-kilted/)
3+
[![Conda](https://img.shields.io/conda/dn/robostack-rolling/ros-rolling-desktop?style=flat-square)](https://anaconda.org/robostack/)
4+
[![GitHub Repo stars](https://img.shields.io/github/stars/robostack/ros-rolling?style=flat-square)](https://github.com/RoboStack/ros-rolling/)
55
[![QUT Centre for Robotics](https://img.shields.io/badge/collection-QUT%20Robotics-%23043d71?style=flat-square)](https://qcr.github.io/)
66

7-
[![Platforms](https://img.shields.io/badge/platforms-linux%20%7C%20win%20%7C%20macos%20%7C%20macos_arm64%20%7C%20linux_aarch64-green.svg?style=flat-square)](https://github.com/RoboStack/ros-kilted)
8-
[![Azure DevOps builds (branch)](https://img.shields.io/github/actions/workflow/status/robostack/ros-kilted/linux.yml?branch=buildbranch_linux&label=build%20linux&style=flat-square)](https://github.com/RoboStack/ros-kilted/actions/workflows/linux.yml)
9-
[![Azure DevOps builds (branch)](https://img.shields.io/github/actions/workflow/status/robostack/ros-kilted/win.yml?branch=buildbranch_win&label=build%20win&style=flat-square)](https://github.com/RoboStack/ros-kilted/actions/workflows/win.yml)
10-
[![Azure DevOps builds (branch)](https://img.shields.io/github/actions/workflow/status/robostack/ros-kilted/osx.yml?branch=buildbranch_osx&label=build%20osx&style=flat-square)](https://github.com/RoboStack/ros-kilted/actions/workflows/osx.yml)
11-
[![Azure DevOps builds (branch)](https://img.shields.io/github/actions/workflow/status/robostack/ros-kilted/osx_arm64.yml?branch=buildbranch_osx_arm64&label=build%20osx-arm64&style=flat-square)](https://github.com/RoboStack/ros-kilted/actions/workflows/osx_arm64.yml)
12-
[![Azure DevOps builds (branch)](https://img.shields.io/github/actions/workflow/status/robostack/ros-kilted/build_linux_aarch64.yml?branch=buildbranch_linux_aarch64&label=build%20aarch64&style=flat-square)](https://github.com/RoboStack/ros-kilted/actions/workflows/build_linux_aarch64.yml)
7+
[![Platforms](https://img.shields.io/badge/platforms-linux%20%7C%20win%20%7C%20macos%20%7C%20macos_arm64%20%7C%20linux_aarch64-green.svg?style=flat-square)](https://github.com/RoboStack/ros-rolling)
8+
[![Azure DevOps builds (branch)](https://img.shields.io/github/actions/workflow/status/robostack/ros-rolling/linux.yml?branch=buildbranch_linux&label=build%20linux&style=flat-square)](https://github.com/RoboStack/ros-rolling/actions/workflows/linux.yml)
9+
[![Azure DevOps builds (branch)](https://img.shields.io/github/actions/workflow/status/robostack/ros-rolling/win.yml?branch=buildbranch_win&label=build%20win&style=flat-square)](https://github.com/RoboStack/ros-rolling/actions/workflows/win.yml)
10+
[![Azure DevOps builds (branch)](https://img.shields.io/github/actions/workflow/status/robostack/ros-rolling/osx.yml?branch=buildbranch_osx&label=build%20osx&style=flat-square)](https://github.com/RoboStack/ros-rolling/actions/workflows/osx.yml)
11+
[![Azure DevOps builds (branch)](https://img.shields.io/github/actions/workflow/status/robostack/ros-rolling/osx_arm64.yml?branch=buildbranch_osx_arm64&label=build%20osx-arm64&style=flat-square)](https://github.com/RoboStack/ros-rolling/actions/workflows/osx_arm64.yml)
12+
[![Azure DevOps builds (branch)](https://img.shields.io/github/actions/workflow/status/robostack/ros-rolling/build_linux_aarch64.yml?branch=buildbranch_linux_aarch64&label=build%20aarch64&style=flat-square)](https://github.com/RoboStack/ros-rolling/actions/workflows/build_linux_aarch64.yml)
1313

14-
[![GitHub issues](https://img.shields.io/github/issues-raw/robostack/ros-kilted?style=flat-square)](https://github.com/RoboStack/ros-kilted/issues)
15-
[![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/robostack/ros-kilted?style=flat-square)](https://github.com/RoboStack/ros-kilted/issues?q=is%3Aissue+is%3Aclosed)
16-
[![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/robostack/ros-kilted?style=flat-square)](https://github.com/RoboStack/ros-kilted/pulls)
17-
[![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed-raw/robostack/ros-kilted?style=flat-square)](https://github.com/RoboStack/ros-kilted/pulls?q=is%3Apr+is%3Aclosed)
14+
[![GitHub issues](https://img.shields.io/github/issues-raw/robostack/ros-rolling?style=flat-square)](https://github.com/RoboStack/ros-rolling/issues)
15+
[![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/robostack/ros-rolling?style=flat-square)](https://github.com/RoboStack/ros-rolling/issues?q=is%3Aissue+is%3Aclosed)
16+
[![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/robostack/ros-rolling?style=flat-square)](https://github.com/RoboStack/ros-rolling/pulls)
17+
[![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed-raw/robostack/ros-rolling?style=flat-square)](https://github.com/RoboStack/ros-rolling/pulls?q=is%3Apr+is%3Aclosed)
1818

19-
[__Table with all available packages & architectures__](https://robostack.github.io/kilted.html)
19+
[__Table with all available packages & architectures__](https://robostack.github.io/rolling.html)
2020

2121
## Why ROS and Conda?
2222

23-
Welcome to RoboStack, which tightly couples ROS with Conda, a cross-platform, language-agnostic package manager. We provide ROS binaries for Linux, macOS, Windows and ARM (Linux). Installing other recent packages via conda-forge side-by-side works easily, e.g. you can install TensorFlow/PyTorch in the same environment as ROS kilted without any issues. As no system libraries are used, you can also easily install ROS kilted on any recent Linux Distribution - including older versions of Ubuntu. As the packages are pre-built, it saves you from compiling from source, which is especially helpful on macOS and Windows. No root access is required, all packages live in your home directory. We have recently written up a [paper](https://arxiv.org/abs/2104.12910) and [blog post](https://medium.com/robostack/cross-platform-conda-packages-for-ros-fa1974fd1de3) with more information.
23+
Welcome to RoboStack, which tightly couples ROS with Conda, a cross-platform, language-agnostic package manager. We provide ROS binaries for Linux, macOS, Windows and ARM (Linux). Installing other recent packages via conda-forge side-by-side works easily, e.g. you can install TensorFlow/PyTorch in the same environment as ROS rolling without any issues. As no system libraries are used, you can also easily install ROS rolling on any recent Linux Distribution - including older versions of Ubuntu. As the packages are pre-built, it saves you from compiling from source, which is especially helpful on macOS and Windows. No root access is required, all packages live in your home directory. We have recently written up a [paper](https://arxiv.org/abs/2104.12910) and [blog post](https://medium.com/robostack/cross-platform-conda-packages-for-ros-fa1974fd1de3) with more information.
2424

2525
## Attribution
2626

‎check_patches_clean_apply.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# From repository root
1313
python .scripts/check_patches_clean_apply.py # prepare + run
1414
python .scripts/check_patches_clean_apply.py --dry # prepare only
15-
python .scripts/check_patches_clean_apply.py --dry --recipe ros-kilted-rviz2
15+
python .scripts/check_patches_clean_apply.py --dry --recipe ros-rolling-rviz2
1616
python .scripts/check_patches_clean_apply.py --clean # delete output
1717
1818
The script creates (or refreshes) a sibling folder named
@@ -76,8 +76,8 @@ def parse_args() -> argparse.Namespace:
7676
metavar="RECIPE",
7777
help=(
7878
"Only check the specified recipe directory under recipes/. "
79-
"Repeat for multiple recipes, e.g. --recipe ros-kilted-rviz2 "
80-
"--recipe ros-kilted-rclcpp"
79+
"Repeat for multiple recipes, e.g. --recipe ros-rolling-rviz2 "
80+
"--recipe ros-rolling-rclcpp"
8181
),
8282
)
8383
return ap.parse_args()

‎conda_build_config.yaml‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
numpy:
22
- 2
33
assimp:
4-
- 5
4+
- 6.0.5
55
libprotobuf:
66
- 6.33.5
77
protobuf:
@@ -33,17 +33,15 @@ tbb_devel:
3333
cmake:
3434
- 3.*
3535

36-
# as of early April 2026 key robotics packages like pinocchio still required eigen 3.4.0.*,
37-
# see https://github.com/conda-forge/eigenpy-feedstock/pull/184
3836
eigen_abi_devel:
39-
- 3.4.0
37+
- 5.0.1
4038

4139

4240
cdt_name: # [linux]
4341
- conda # [linux]
4442

4543
python:
46-
- 3.12.* *_cpython
44+
- 3.14.* *_cp314
4745
python_impl:
4846
- cpython
4947

@@ -59,7 +57,7 @@ c_stdlib:
5957
- macosx_deployment_target # [osx]
6058
- vs # [win]
6159
c_stdlib_version: # [unix]
62-
- 2.17 # [linux]
60+
- 2.28 # [linux]
6361
- 11.0 # [osx and x86_64]
6462
- 11.0 # [osx and arm64]
6563
cxx_compiler:
@@ -71,14 +69,9 @@ cxx_compiler_version: # [unix]
7169
- 18 # [osx]
7270

7371
libzenohc:
74-
- 1.7.2
72+
- 1.9.0
7573
libzenohcxx:
76-
- 1.7.2
74+
- 1.9.0
7775

7876
libhwloc:
7977
- 2.12.2
80-
81-
urdfdom:
82-
- 4.0.1
83-
urdfdom-headers:
84-
- 1.1.2

0 commit comments

Comments
 (0)