Skip to content

feat(pixi-build-ros): name packages as RoboStack does - #7539

Merged
Hofer-Julian merged 2 commits into
prefix-dev:mainfrom
Tobias-Fischer:pixi-build-ros-names
Nov 17, 2026
Merged

Hofer-Julian merged 2 commits into
prefix-dev:mainfrom
Tobias-Fischer:pixi-build-ros-names

Conversation

@Tobias-Fischer

@Tobias-Fischer Tobias-Fischer commented Nov 13, 2026 •

Copy link
Copy Markdown
Contributor

Description

Part 1 of 3, split out of #7535 for easier review: this one, then #7540 (build scripts), then #7541 (requirement rules). It applies directly to main and doesn't depend on #7533.

Tobi's human description

We have recently changed the names of packages in RoboStack. They are now ros2-<name> with ros-<distro>-* as compatibility packages. This PR changes the behaviour of pixi-build-ros to match RoboStack behaviour, except for ROS 1 which keeps the name.

The PR also pins the mutex.

It also encourages the new behaviour in the docs, which still point to the old names.


AI-generated details (Claude Opus 5.5)

Names: ROS 2 packages are ros2-<name>, as RoboStack publishes them (ros-<distro>-* remain as compatibility packages there). ROS 1 keeps ros-<distro>-<name>, because robostack-noetic only publishes those names. Distro::conda_name names the built package, unmapped and ros:-mapped dependencies, and workspace siblings.

Mutex: the ROS 2 names don't say which distribution a package belongs to, so the distro mutex in host and run is pinned: ros2-distro-mutex * <distro>_* (Distro::mutex_spec). Merging it with a mutex the user declares (e.g. 0.5.*) keeps the build string: merge_specs merges the versions and keeps either side's build string, and conflicting build strings are an error.

Migration: a pixi.toml that names a ROS 2 path dependency ros-<distro>-<name> has to rename it to ros2-<name>; the backend docs now say so. RoboStack's ros2-* builds need macOS 14 (__osx >=14), so on macOS the workspace needs [system-requirements] macos = "14.0" (the old names still resolved to older builds). The docs mention it, and the integration tests' workspace sets it.

Not changed here: the docs' example ROS workspace uses the new names in its pixi.toml, but its pixi.lock needs a released backend to re-lock, so that should follow in a separate PR.

  • The docs use the new names; ROS 1 keeps ros-<distro>-.
  • The Python integration tests (test_ros.py) expect the new names; they pass locally on osx-arm64 (10 passed, 1 skipped).
  • Snapshot changes: the jazzy inline snapshots name everything ros2-<name> and pin ros2-distro-mutex * jazzy_*. In the noetic snapshots only the mutex changes, to ros-distro-mutex * noetic_*.
  • Checks run on the stack: cargo test -p pixi-build-ros, cargo clippy -p pixi-build-ros --all-targets -- -D warnings, cargo fmt --check, pixi run typos, check-into-diagnostic.

Checklist:

  • I've discussed the proposed changes with a maintainer.
  • I understand the purpose of my changes and how they interact with the greater system.
  • User-facing changes are documented and prose in the documentation has been written/edited/reviewed by hand.

🤖 Generated with Claude Code

@Tobias-Fischer

Copy link
Copy Markdown
Contributor Author

Merge order for the pixi-build-ros RoboStack PRs. GitHub's stacked PRs don't support fork branches, so they're plain PRs with the dependencies below:

  1. feat(pixi-build-ros): RoboStack's rosdep mappings per distribution, one lookup shared with RoboStack #7533 (shared rosdep lookup) and feat(pixi-build-ros): name packages as RoboStack does #7539 (names): independent, either order
  2. feat(pixi-build-ros): build with RoboStack's build scripts #7540 (build scripts): needs feat(pixi-build-ros): name packages as RoboStack does #7539; its first commit is feat(pixi-build-ros): name packages as RoboStack does #7539
  3. feat(pixi-build-ros): make requirements by RoboStack's rules #7541 (requirement rules): needs feat(pixi-build-ros): build with RoboStack's build scripts #7540 and feat(pixi-build-ros): RoboStack's rosdep mappings per distribution, one lookup shared with RoboStack #7533; only its last commit is new

Already merged: #7529 (licenses), #7534 (SPDX fix). Once a PR merges, I'll rebase the next one so its diff shows only its own changes.

— Claude (on behalf of @Tobias-Fischer)

Tobias-Fischer added a commit to Tobias-Fischer/vinca-rs that referenced this pull request Nov 14, 2026
* ros_workspace's activation scripts live here again; follow the split pixi PRs

pixi-build-ros's recipe-rules PR was split into prefix-dev/pixi#7539/#7540/#7541,
and `pixi build` doesn't use the activation scripts, so they stay with the
recipe generator. Repinned to the end of that stack (pixi-build-ros-requirements).
Parity: the same 44,950 recipes as 0.1.7 (4 distros x 5 platforms).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Follow the rebased pixi PRs; rattler-build#2943 directly

pixi-build-ros now comes from the end of the rebased pixi PRs (#7539 on main,
#7540, #7541 with #7533 merged in). pixi main moved to rattler_solve 13 and the
rattler-build 0.2.25 crates, so rattler_build_core is pinned to #2943's own branch
(no older-commit integration branch any more) and the rattler pins follow
(rattler_build_recipe/variant_config 0.1.25, rattler_solve 13).
The Cargo.toml comment lists the pixi PRs' merge order.

Parity: the same 44,950 recipes as 0.1.7 (4 distros x 5 platforms).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Per-package recipe files from the config (files/<pkg>/)

ros_workspace's activation scripts move to the distribution config
(RoboStack/robostack shared/files/ros2-ros-workspace/), next to the patches
and tests: any files/<pkg>/ folder of a config layer is copied into that
package's recipe directory. The ros_workspace special case and the embedded
scripts go. Also follows the pixi PRs to ab454118b (Ninja for ament_cmake on
Windows, a dead ros-humble block dropped).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
RoboStack's canonical names for ROS 2 are `ros2-<name>`; `ros-<distro>-<name>`
are only compatibility aliases. The backend now uses them for the package it
builds, for unmapped and `ros:`-mapped dependencies, and for workspace siblings
(`Distro::conda_name`). ROS 1 keeps `ros-<distro>-<name>`: robostack-noetic
only publishes those names.

ROS 2 names no longer say which distribution a package belongs to, so the
distro mutex in host and run is pinned to it: `ros2-distro-mutex * <distro>_*`
(`Distro::mutex_spec`; RoboStack builds the mutex with the build string
`<distro>_<build number>`). Merging that with a mutex the user declares (e.g.
`0.5.*`) needs merged specs to keep a build string: `merge_specs` now merges the
versions and keeps the build string of either side (conflicting build strings
are an error).

The docs say how to migrate a `pixi.toml` that names ROS 2 path dependencies
`ros-<distro>-<name>`. The integration tests and the docs' example workspace use
the new names, and the test workspace requires macOS 14: RoboStack's `ros2-*`
builds need `__osx >=14` (the old names still resolved to older builds).

Snapshot changes:
- the jazzy inline snapshots (generate_recipe, condition_evaluation_*) name
  everything `ros2-<name>` instead of `ros-jazzy-<name>`, and the mutex is
  `ros2-distro-mutex * jazzy_*`
- in the noetic .snap files `ros-distro-mutex` is `ros-distro-mutex * noetic_*`
  in host and run, and in generate_recipe_with_mutex_version the user's `0.5.*`
  merges into `ros-distro-mutex 0.5.* noetic_*`

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@Tobias-Fischer
Tobias-Fischer marked this pull request as ready for review November 17, 2026 07:18
@Tobias-Fischer

Copy link
Copy Markdown
Contributor Author

This is ready for review @Hofer-Julian

Fix Python executable paths, pin the build distro, and preserve qualified dependencies when merging unconstrained specs. Accept compatible exact mutex build pins.

Verified with 97 Rust tests, 27 integration probes, and pixi run typos.
@Hofer-Julian
Hofer-Julian merged commit 8dfe8f3 into prefix-dev:main Nov 17, 2026
41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants