chore: back-merge release 0.11.6 into next#384
Merged
Conversation
Co-authored-by: Max Parke <max.parke@scale.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: stainless-app[bot] <142633134+stainless-app[bot]@users.noreply.github.com> Co-authored-by: Stas Moreinis <stas.moreinis@scale.com> Co-authored-by: Declan Brady <declan.brady@scale.com> Co-authored-by: Michael Chou <michael.chou@scale.com> Co-authored-by: Daniel Miller <daniel.miller@scale.com>
Co-authored-by: Max Parke <max.parke@scale.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: stainless-app[bot] <142633134+stainless-app[bot]@users.noreply.github.com> Co-authored-by: Stas Moreinis <stas.moreinis@scale.com> Co-authored-by: Declan Brady <declan.brady@scale.com> Co-authored-by: Michael Chou <michael.chou@scale.com> Co-authored-by: Daniel Miller <daniel.miller@scale.com> Co-authored-by: Matteo Librizzi <matteo.librizzi@scale.com>
Merge main (0.11.5 + 0.11.6 releases) into next. Conflicts resolved: - version bookkeeping (.release-please-manifest.json, pyproject.toml, _version.py): take 0.11.6 from main - CHANGELOG.md: keep main's released 0.11.6 section - span_queue.py / test_span_queue.py: keep next's version, which carries bounded-concurrency export (#374) on top of the linger change (#362) that main has only as the squashed 0.11.5 commit
declan-scale
approved these changes
Jun 1, 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.
Why
nexthad diverged frommain, leaving release PR #382 (release: 0.11.6) with merge conflicts.maincarries the0.11.5+0.11.6releases (where #362's span-queue linger change landed as a squashed commit), whilenextcarries the original#362plus bounded-concurrency export (#374) stacked on the samespan_queue.pyregion — so git saw two unrelated commits editing the same lines and couldn't auto-merge.This back-merges
mainintonextto realign the histories. Once merged, release-please regenerates #382 conflict-free.Conflict resolution
.release-please-manifest.json,pyproject.toml,_version.py): tookmain's0.11.6— the released version wins innext.CHANGELOG.md: keptmain's released## 0.11.6section above the existing0.11.5block.span_queue.py/tests/.../test_span_queue.py: keptnext's version, which carries bounded-concurrency export (perf(tracing): bounded-concurrency span export #374) on top of the linger change (perf(tracing): span queue linger + per-loop httpx keepalive #362) thatmainonly has as the squashed0.11.5commit. Verified byte-identical toorigin/next— no regression of perf(tracing): bounded-concurrency span export #374.Verification
tests/lib/core/tracing/→ 52 passed, 2 skipped;ruffclean.maincleanly, confirming this clears release: 0.11.7 #382's conflicts.Greptile Summary
This PR back-merges
main(carrying the 0.11.5 and 0.11.6 releases) intonextto resolve the merge conflict that was blocking release PR #382. Only version bookkeeping files are touched — no functional code changed.0.11.5→0.11.6applied consistently across.release-please-manifest.json,pyproject.toml, andsrc/agentex/_version.py.## 0.11.6section (features, bug fixes, perf improvements, chores) is prepended above the existing## 0.11.5block, accurately reflecting the released content frommain.span_queue.py/ tests (not in this diff): per the description, those files were kept atorigin/nextto preserve the bounded-concurrency export from perf(tracing): bounded-concurrency span export #374 on top of the linger change from perf(tracing): span queue linger + per-loop httpx keepalive #362 — verified byte-identical.Confidence Score: 5/5
Safe to merge — all changes are pure version bookkeeping with no functional code touched.
All four changed files do exactly what the description says: bump the version string from 0.11.5 to 0.11.6 in lockstep across the manifest, pyproject, and generated version file, and prepend the correct 0.11.6 changelog section. The version numbers are consistent across every file, no conflict markers remain, and the functional code (span_queue.py and its tests) is untouched by this diff.
No files require special attention.
Important Files Changed
Sequence Diagram
sequenceDiagram participant main participant next participant release_please as release-please note over main: v0.11.5 squash-merged (#362 linger change) note over main: v0.11.6 released (features, bug fixes) note over next: #362 original commit note over next: #374 bounded-concurrency export stacked on top main->>next: "back-merge (this PR #384)" note over next: Version files → 0.11.6 (from main) note over next: span_queue.py → kept from next (preserves #374) next->>release_please: "trigger #382 regeneration" release_please-->>next: conflict-free release PRReviews (1): Last reviewed commit: "chore: back-merge release 0.11.6 into ne..." | Re-trigger Greptile