From 75e7feedbd07c66e903744ea184219a96023ae34 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 6 Jul 2026 15:59:56 +0000 Subject: [PATCH] =?UTF-8?q?chore(deps):=20O-2=20de-pin=20=E2=80=94=20ruff?= =?UTF-8?q?=20deps=20flip=20to=20branch=3Dmain=20(convergence=20branch=20r?= =?UTF-8?q?etired)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ruff #44 landed the schema stratum + ruff_sqlalchemy_spo on main, so the convergence branch claude/odoo-rs-transcode-lf8ya5 is no longer needed as a dependency source. Flips ruff_spo_triplet/ruff_spo_address (ogar-from-ruff), ruff_ruby_spo (ogar-from-rails), and the ogar-action-handler dev-dep to branch=main. All ruff-dependent + workspace tests green against ruff main (7bc1a78c). Unblocks consumer reachability of ogar_vocab::recipe (#157 §6). Co-Authored-By: Claude Opus 4.8 --- crates/ogar-action-handler/Cargo.toml | 4 ++-- crates/ogar-from-rails/Cargo.toml | 4 ++-- crates/ogar-from-ruff/Cargo.toml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/ogar-action-handler/Cargo.toml b/crates/ogar-action-handler/Cargo.toml index 8042009..17e196e 100644 --- a/crates/ogar-action-handler/Cargo.toml +++ b/crates/ogar-action-handler/Cargo.toml @@ -25,5 +25,5 @@ serde_json = "1.0" # (harvest arm) rather than a hand-written capability, so the probe # witnesses lift -> dispatch. Not a runtime dependency of this crate. ogar-from-ruff = { path = "../ogar-from-ruff" } -# Flips to branch = "main" with the other ruff pins (O-2 de-pin); keep in lockstep with ogar-from-ruff. -ruff_spo_triplet = { git = "https://github.com/AdaWorldAPI/ruff", branch = "claude/odoo-rs-transcode-lf8ya5" } +# On ruff `main` (O-2 de-pin done 2026-07-06); keep in lockstep with ogar-from-ruff. +ruff_spo_triplet = { git = "https://github.com/AdaWorldAPI/ruff", branch = "main" } diff --git a/crates/ogar-from-rails/Cargo.toml b/crates/ogar-from-rails/Cargo.toml index 071beec..a53a6a2 100644 --- a/crates/ogar-from-rails/Cargo.toml +++ b/crates/ogar-from-rails/Cargo.toml @@ -22,9 +22,9 @@ ogar-from-ruff = { path = "../ogar-from-ruff" } # Operator ruling: rev pins on AdaWorldAPI-internal git deps are retired — # they were "out of desperation to lock what hadn't converged in transpiler # sink-in yet." Drift protection is the fuse tests, not pins. Floats on the -# convergence branch `claude/odoo-rs-transcode-lf8ya5` in lockstep with +# ruff `main` (O-2 de-pin 2026-07-06) in lockstep with # ogar-from-ruff (they share ruff_spo_triplet internally). Flips to # `branch = "main"` once the convergence branches merge. Cargo.lock still # locks a concrete rev for reproducibility. -ruff_ruby_spo = { git = "https://github.com/AdaWorldAPI/ruff", branch = "claude/odoo-rs-transcode-lf8ya5" } +ruff_ruby_spo = { git = "https://github.com/AdaWorldAPI/ruff", branch = "main" } serde = { workspace = true, optional = true } diff --git a/crates/ogar-from-ruff/Cargo.toml b/crates/ogar-from-ruff/Cargo.toml index c7571c7..cbd1967 100644 --- a/crates/ogar-from-ruff/Cargo.toml +++ b/crates/ogar-from-ruff/Cargo.toml @@ -17,11 +17,11 @@ ogar-vocab = { path = "../ogar-vocab" } # Operator ruling: rev pins on AdaWorldAPI-internal git deps are retired — # they were "out of desperation to lock what hadn't converged in transpiler # sink-in yet." Drift protection is the fuse tests, not pins. Floats on the -# convergence branch `claude/odoo-rs-transcode-lf8ya5` (shared with +# ruff `main` (O-2 de-pin 2026-07-06 — convergence branch retired; shared with # ogar-from-rails; bump the branch reference in lockstep if it ever # renames). Flips to `branch = "main"` once the convergence branches merge. # Cargo.lock still locks a concrete rev for reproducibility — this is not a # return to floating `main` unpinned. -ruff_spo_triplet = { git = "https://github.com/AdaWorldAPI/ruff", branch = "claude/odoo-rs-transcode-lf8ya5" } -ruff_spo_address = { git = "https://github.com/AdaWorldAPI/ruff", branch = "claude/odoo-rs-transcode-lf8ya5" } +ruff_spo_triplet = { git = "https://github.com/AdaWorldAPI/ruff", branch = "main" } +ruff_spo_address = { git = "https://github.com/AdaWorldAPI/ruff", branch = "main" } serde = { workspace = true, optional = true }