chore: re-lock uv.lock to match the bench optional-dependency extra#545
chore: re-lock uv.lock to match the bench optional-dependency extra#545mattmillerai wants to merge 1 commit into
Conversation
The bench extra (anthropic>=0.40) was added to pyproject.toml without regenerating uv.lock, so `uv lock --check` failed on main and a bare `uv run` silently re-locked and re-dirtied the working tree. Regenerated with `uv lock`. Adds the anthropic dependency tree (anthropic, pydantic, pydantic-core, jiter, docstring-parser, annotated-types, typing-inspection) and records the bench extra in provides-extras. No existing package version changes.
|
Important Review skippedReview was skipped due to path filters ⛔ Files ignored due to path filters (1)
CodeRabbit blocks several paths by default. You can override this behavior by explicitly including those paths in the path filters. For example, including ⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
✨ Simplify code
Comment |
There was a problem hiding this comment.
🔍 Cursor Review — Consolidated panel
Triggered by @mattmillerai.
✅ No high-signal findings.
Panel: 6/8 reviewers contributed findings.
Reviewers that did not contribute: kimi-k2.5:adversarial (empty), kimi-k2.5:edge-case (empty)
|
The failing Root cause
Timeline lines up exactly: Why this PR cannot be the cause
The fix is #536, not here#536 ( Merge-order note#536 changes
Verified the lockfile is still correct as-is: Leaving the code untouched. Happy to rebase + re-lock the moment #536 lands. |
The lock refresh (adding anthropic/pydantic for the `bench` optional extra) was swept in accidentally by `uv run` regenerating the stale lock during local test runs. It has nothing to do with the per-operation `workflow_too_large` hints this PR is about, and the same re-lock is already covered by its own dedicated PRs (#534/#541/#543/#545). Keeps this PR scoped to comfy_cli/command/workflow.py + its tests. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
|
🤖 Reviews-resolver re-checked this PR — status unchanged and confirmed:
|
ELI-5
pyproject.tomlgained an optionalbenchextra a while back (in #490), but the lockfile was never regenerated to match. So the lock and the manifest disagreed:uv lock --checkfailed onmain, and any bareuv run— like the one in our own test instructions — would silently re-lock and leave a ~287-lineuv.lockdiff in your working tree. That has already been committed into an unrelated PR by accident once, and reverted to keep that PR's diff clean. This regenerates the lockfile so the two agree again.What changed
uv.lockonly, regenerated withuv lock(uv 0.11.26) from a clean checkout ofmain:anthropicdependency tree pulled in by thebenchextra:anthropic,pydantic,pydantic-core,jiter,docstring-parser,annotated-types,typing-inspection.benchinprovides-extras.Risk surface
The diff is 285 additions and 2 deletions. Everything else is purely additive. Both deletions:
provides-extras = ["dev", "preview"]→["bench", "dev", "preview"]— this is the manifest/lock disagreement being fixed.exceptiongroup's dependency ontyping-extensionslost itspython_full_version < '3.13'marker. This is a semantic no-op:exceptiongroupis only ever reachable underpython_full_version < '3.11'(viaanyioandpytest), so a< '3.13'marker is tautologically true everywhere it is installed, and uv simplified it away.No existing package version changed — no other lines were removed.
requires-python = ">=3.10"and the lockfile revision are unchanged.Verification
uv lock --check→ exits 0 (fails onmaintoday).uv run -p 3.10 --extra dev pytest tests/comfy_cli/command/ -q→ 1157 passed, 2 skipped.uv run -p 3.10 --extra dev pytest tests/comfy_cli/ -q→ 2471 passed, 13 skipped.ruff check .reports 14 pre-existingUP038errors — identical on a pristineorigin/maincheckout, so unrelated to this change.ruff format --check .→ 235 files already formatted.uv run --extra bench python -c "import anthropic, pydantic"→ installs the 7 new packages and imports cleanly (anthropic 0.117.0 / pydantic 2.13.4), confirming the newly-locked tree actually resolves rather than just looking plausible.uv run, the working tree shows no new lock churn anduv lock --checkstill exits 0 — the silent re-dirty behavior is gone.Judgment calls
uv.lock, and only fix(registry): emit pyproject hints as standalone comments for tomlkit 0.15 #536 touchespyproject.toml— so there is no conflict to wait for and this can land in any order.tomlkit>=0.13,<0.16. Applying that change on top of this branch makesuv lock --checkfail again, so whichever of the two merges second needs a re-lock. Cheapest fix is for fix(registry): emit pyproject hints as standalone comments for tomlkit 0.15 #536 to runuv lockand include the result.uv lock --checkgate is deliberately not included here. The hardening is worth doing — fix(registry): emit pyproject hints as standalone comments for tomlkit 0.15 #536 above is concrete proof the drift recurs — but it is a repo-wide CI policy change that would immediately fail an in-flight PR, and it touches nothing this PR touches. It is better as its own PR that can be weighed on its own merits than bundled into a mechanical re-lock. Recommending it as a follow-up.