Fix/python cargo lock drift - #1899
Merged
Merged
Conversation
djanand
marked this pull request as draft
June 26, 2026 05:53
djanand
marked this pull request as ready for review
June 27, 2026 01:11
martin-g
approved these changes
Jun 29, 2026
Contributor
Author
|
This requires #1919 to be reviewed & merged since |
Contributor
djanand
force-pushed
the
fix/python-cargo-lock-drift
branch
from
July 3, 2026 03:48
62cba08 to
4d07e10
Compare
Contributor
Author
|
thanks @coderfender. Can you please review/approve/merge this PR ? |
coderfender
pushed a commit
to coderfender/datafusion-ballista
that referenced
this pull request
Jul 13, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Closes #1887.
Rationale for this change
python/is a separate Cargo workspace (excluded from the root workspace) with its ownpython/Cargo.lock, and it path-depends on the main ballista crates. Two gaps make that lock drift out of sync:directory: "/")- there is no/pythonentry, so dep bumps update/Cargo.lockbut neverpython/Cargo.lock.rust.ymlruns--lockedonly against the main workspace (python is excluded). A stale python lock only surfaces later and cryptically, inbuild.yml's maturin steps (which run withlocked = truefrompython/pyproject.toml): error: cannot update the lock file python/Cargo.lock because --locked was passedNet effect: when a dep moves in a ballista crate manifest (e.g.
itertools,tower-httpwere bumped to0.15/0.7),python/Cargo.lockis left behind onmain, and the next contributor inherits a red maturin build with an unhelpful message. This PR fixes the current drift and adds a guard so future drift is caught on the PR that introduces it.What changes are included in this PR?
python/Cargo.lock- minimally reconciled with the manifests (picks up the already-publisheditertools 0.15.0/tower-http 0.7.0that flow in via the ballista path-deps; lockfile format v4 preserved). This fixes the current drift so the new guard passes from day one..github/workflows/dependencies.yml- newpython-lockjob that runscargo metadata --lockedinpython/and fails with an actionable message (run 'cd python && cargo update' and commit) if the lock is stale. The workflow already triggers on**/Cargo.toml/**/Cargo.lock, so both main-workspace and python changes exercise it..github/dependabot.yml- newcargoentry fordirectory: "/python"(mirroring the root block's manual-bump ignore list for arrow/datafusion/sqlparser), so python's direct deps stay fresh.Are there any user-facing changes?
No runtime/API changes - this is CI/tooling only.
One contributor-facing note: dependabot bumps a transitive dep into python via the ballista path-deps (which python doesn't declare directly, so dependabot can't sync python's lock for it). Such a PR will now trip the
python-lockguard and needs a one-linecd python && cargo update+ commit on that branch. This isn't new breakage - that drift already broke the nextpython/**PR cryptically; the guard just relocates it to the PR that caused it, with a clear fix message.No breaking changes to public APIs.