Skip to content

Commit d12a9c0

Browse files
authored
Merge pull request #159 from AdaWorldAPI/claude/o2-depin-ruff-main
chore(deps): O-2 de-pin — ruff deps → branch=main (retire convergence branch)
2 parents 318b46f + 75e7fee commit d12a9c0

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

crates/ogar-action-handler/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ serde_json = "1.0"
2525
# (harvest arm) rather than a hand-written capability, so the probe
2626
# witnesses lift -> dispatch. Not a runtime dependency of this crate.
2727
ogar-from-ruff = { path = "../ogar-from-ruff" }
28-
# Flips to branch = "main" with the other ruff pins (O-2 de-pin); keep in lockstep with ogar-from-ruff.
29-
ruff_spo_triplet = { git = "https://github.com/AdaWorldAPI/ruff", branch = "claude/odoo-rs-transcode-lf8ya5" }
28+
# On ruff `main` (O-2 de-pin done 2026-07-06); keep in lockstep with ogar-from-ruff.
29+
ruff_spo_triplet = { git = "https://github.com/AdaWorldAPI/ruff", branch = "main" }

crates/ogar-from-rails/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ ogar-from-ruff = { path = "../ogar-from-ruff" }
2222
# Operator ruling: rev pins on AdaWorldAPI-internal git deps are retired —
2323
# they were "out of desperation to lock what hadn't converged in transpiler
2424
# sink-in yet." Drift protection is the fuse tests, not pins. Floats on the
25-
# convergence branch `claude/odoo-rs-transcode-lf8ya5` in lockstep with
25+
# ruff `main` (O-2 de-pin 2026-07-06) in lockstep with
2626
# ogar-from-ruff (they share ruff_spo_triplet internally). Flips to
2727
# `branch = "main"` once the convergence branches merge. Cargo.lock still
2828
# locks a concrete rev for reproducibility.
29-
ruff_ruby_spo = { git = "https://github.com/AdaWorldAPI/ruff", branch = "claude/odoo-rs-transcode-lf8ya5" }
29+
ruff_ruby_spo = { git = "https://github.com/AdaWorldAPI/ruff", branch = "main" }
3030
serde = { workspace = true, optional = true }

crates/ogar-from-ruff/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ ogar-vocab = { path = "../ogar-vocab" }
1717
# Operator ruling: rev pins on AdaWorldAPI-internal git deps are retired —
1818
# they were "out of desperation to lock what hadn't converged in transpiler
1919
# sink-in yet." Drift protection is the fuse tests, not pins. Floats on the
20-
# convergence branch `claude/odoo-rs-transcode-lf8ya5` (shared with
20+
# ruff `main` (O-2 de-pin 2026-07-06 — convergence branch retired; shared with
2121
# ogar-from-rails; bump the branch reference in lockstep if it ever
2222
# renames). Flips to `branch = "main"` once the convergence branches merge.
2323
# Cargo.lock still locks a concrete rev for reproducibility — this is not a
2424
# return to floating `main` unpinned.
25-
ruff_spo_triplet = { git = "https://github.com/AdaWorldAPI/ruff", branch = "claude/odoo-rs-transcode-lf8ya5" }
26-
ruff_spo_address = { git = "https://github.com/AdaWorldAPI/ruff", branch = "claude/odoo-rs-transcode-lf8ya5" }
25+
ruff_spo_triplet = { git = "https://github.com/AdaWorldAPI/ruff", branch = "main" }
26+
ruff_spo_address = { git = "https://github.com/AdaWorldAPI/ruff", branch = "main" }
2727
serde = { workspace = true, optional = true }

0 commit comments

Comments
 (0)