Skip to content

bump_partial: keep pkg_additional_info.yaml in pixi run sort order #72

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tobias-Fischer merged 1 commit into from
Oct 10, 2026
Merged

bump_partial: keep pkg_additional_info.yaml in pixi run sort order #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions tools/maintenance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ def bump_partial(distro: str, packages: dict[str, str]) -> list[str]:
entry["build_number"] = number
with info.open("w") as fh:
ry.dump(data, fh)
from vinca.sort_yaml_keys import sort_mapping_keys

sort_mapping_keys(info) # `pixi run sort` order (rs check fails otherwise): build-number entries last
return [f"{len(packages)} packages get `build_number: {number}` in `distros/{distro}/pkg_additional_info.yaml`"]


Expand Down
17 changes: 17 additions & 0 deletions tools/tests/test_mutex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,20 @@ def test_partial_rebuild_leaves_the_mutex_alone(tmp_path, monkeypatch):
info = maintenance.yaml.safe_load((distro / "pkg_additional_info.yaml").read_text())
assert info == {"rclcpp": {"build_number": 8, "add_host": ["foo"]}, "std_msgs": {"build_number": 8}}
assert (distro / "vinca.yaml").read_text() == vinca


def test_partial_rebuild_keeps_pkg_additional_info_sorted(tmp_path, monkeypatch):
from vinca.sort_yaml_keys import sort_mapping_keys

distro = tmp_path / "distros" / "testdistro"
distro.mkdir(parents=True)
(distro / "vinca.yaml").write_text("ros_distro: testdistro\nbuild_number: 5\n")
(distro / "pkg_additional_info.yaml").write_text("zeta:\n add_host: [foo]\nalpha:\n build_number: 3\n")
monkeypatch.setattr(rs, "DISTROS", tmp_path / "distros")
monkeypatch.setattr(maintenance, "released_builds", lambda d: {"ros2-alpha": 7})
monkeypatch.setattr(rs, "read_vinca", lambda d, platform=None: {"mutex_package": {"name": "ros2-distro-mutex"}})

maintenance.bump_partial("testdistro", {"mid": "uses libboost", "beta": "uses libboost"})

info = distro / "pkg_additional_info.yaml"
assert sort_mapping_keys(info) is False # already in `pixi run sort` order: nothing to change
Loading