Skip to content

merge queue: checking main (4299cdf) and #677 together - #684

Closed
mergify[bot] wants to merge 3 commits into
mainfrom
mergify/merge-queue/d38c4d452d
Closed

merge queue: checking main (4299cdf) and #677 together#684
mergify[bot] wants to merge 3 commits into
mainfrom
mergify/merge-queue/d38c4d452d

Conversation

@mergify

@mergify mergify Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch main (4299cdf) and #677 are queued together for merge.

This pull request has been created by Mergify to check the mergeability of #677.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue rule default for merge:

Required conditions to stay in the queue:

---
checking_base_sha: 4299cdf82e9b65bc52a85a53d6b62cf068db0723
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 677
    scopes: []
scopes: []
...

jd and others added 3 commits August 5, 2026 17:38
`on.pull_request.branches` filters on the *base* branch, not the head. With
it pinned to `main`, only a pull request merging directly into `main` ran
CI -- every stacked pull request, whose base is the branch below it in the
stack, got no test, lint or mypy run at all and showed nothing but the
Mergify checks.

Drop the filter so CI runs for every pull request regardless of base.

Change-Id: I1c211a106a57b9f4986bec4b76c0680c1a0f1b61
`__radd__` was annotated `other: wait_base`, which is the one type it can
never receive: `wait_base.__add__` always succeeds, so Python never falls
back to the reflected operator for two wait strategies. The only caller is
`sum()`, which seeds its accumulator with the int 0 — hence the
`type: ignore[comparison-overlap]` on `other == 0`, and the dead
`return self` branch behind it that `--warn-unreachable` flags.

Annotate the parameter as `int` and return `NotImplemented` for a non-zero
left operand, so `5 + wait_fixed(1)` raises `TypeError` at the addition
rather than building a `wait_combine` that explodes later when called.

With the signature corrected, mypy infers `sum([...])` over wait strategies
on its own, so four `type: ignore[list-item]` comments in
`test_wait_arbitrary_sum` are no longer needed.

Change-Id: Iad1bcef4412d6afc1a6f1335970cfbfcc4a34fcb
@mergify mergify Bot closed this Aug 5, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/d38c4d452d branch August 5, 2026 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant