Skip to content

merge queue: checking main (4299cdf), #677 and #678 together - #685

Closed
mergify[bot] wants to merge 5 commits into
mainfrom
mergify/merge-queue/4a8fb478f2
Closed

merge queue: checking main (4299cdf), #677 and #678 together#685
mergify[bot] wants to merge 5 commits into
mainfrom
mergify/merge-queue/4a8fb478f2

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), #677 and #678 are queued together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #678.
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: 7dc04e4289a3802e7569df59f934e2610d53769a
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 678
    scopes: []
scopes: []
...

jd and others added 5 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
`strict = true` is a curated subset, not every check mypy has. These five
error codes and three flags are all off under `strict` and all report zero
errors on the current tree, so turning them on costs nothing today and
catches regressions from here on:

- `warn_unreachable` -- dead branches, which are usually a wrong annotation
  rather than dead code (see the `wait_base.__radd__` fix below this commit)
- `disallow_any_unimported` -- silent `Any` leaking in from untyped deps
- `extra_checks` -- unsafely overlapping operator signatures, among others
- `ignore-without-code` -- keeps `type: ignore` comments specific
- `redundant-expr`, `truthy-iterable`, `unused-awaitable`, `exhaustive-match`

Deliberately left off: `disallow_any_expr` (655 errors -- unusable for a
decorator library) and `disallow_any_decorated` (63 errors, all inherent to
`@retry` wrapping untyped test helpers).

Change-Id: I9eee43a749050d2bcf0aa0abbedf8725301eba18
@mergify mergify Bot closed this Aug 5, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/4a8fb478f2 branch August 5, 2026 15:43
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