chore: back-merge release 0.11.7 into next#387
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: Matteo Librizzi <matteo.librizzi@scale.com> Co-authored-by: Stas Moreinis <smoreinis@gmail.com>
….7-into-next # Conflicts: # CHANGELOG.md # src/agentex/lib/core/tracing/span_queue.py
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
Release PR #386 (
release: 0.11.8) is showingCONFLICTING/DIRTY. The0.11.7release PR (#382) was squash-merged intomain(this repo is squash-only), creating commit845c8d4bthatnexthas no ancestry to. Because git's 3-way merge has no shared ancestor for that content,nextandmainconflict on every file 0.11.7 touched — version/changelog metadata plusspan_queue.py,init.py,test_span_queue.py.This is a true merge commit (not squash), so
845c8d4bbecomes a genuine ancestor ofnext, clearing the divergence and the #386 conflicts.What
main(0.11.7,845c8d4b) intonext.0.11.7(_version.py,pyproject.toml,.release-please-manifest.json).CHANGELOG.md: kept both next's## Unreleased(tracing metrics) section and main's## 0.11.7release entry.span_queue.py) resolved in favor ofnext— next is a strict superset (same START/END dispatch logic + tracing telemetry).init.py/test_span_queue.pywere already identical on next.Conflict resolution notes
All source files in the merged tree are byte-identical to
next; the only net change is main's release metadata.tests/lib/core/tracing/test_span_queue.py: 31 passed.Merge this with a real merge commit, NOT squash (a squashed back-merge is a no-op and won't fix the divergence).
allow_merge_commitwas temporarily enabled for this; restore squash-only after merging.Greptile Summary
This is a back-merge of the
0.11.7release frommainintonext, restoring shared git ancestry so the pending0.11.8release PR (#386) can merge cleanly. All source files are byte-identical tonext; only release metadata changes.pyproject.toml,src/agentex/_version.py, and.release-please-manifest.jsonall advance from0.11.6→0.11.7consistently.CHANGELOG.mdgains the## 0.11.7section (OpenAI Agents SDK examples + bounded-concurrency span export) while keeping the existing## Unreleasedtracing-metrics entry for the upcoming0.11.8release.Confidence Score: 5/5
Safe to merge — all changes are release metadata only; no source logic is touched.
All four changed files are version strings and changelog text. The version number is advanced consistently across pyproject.toml, _version.py, and .release-please-manifest.json, and the CHANGELOG.md correctly inserts the ## 0.11.7 block between the existing ## Unreleased and ## 0.11.6 sections. There is nothing here that could affect runtime behavior.
No files require special attention.
Important Files Changed
Sequence Diagram
sequenceDiagram participant main participant next Note over main: squash-merge of PR #382 (0.11.7)<br/>creates commit 845c8d4b Note over next: has no ancestry to 845c8d4b<br/>conflicts with main on 0.11.7 files main->>next: "true merge commit (this PR #387)<br/>845c8d4b becomes ancestor of next" Note over next: version metadata advanced to 0.11.7<br/>CHANGELOG gets ## 0.11.7 section<br/>source files unchanged (next is superset) Note over next: release PR #386 (0.11.8)<br/>can now merge cleanly — divergence clearedReviews (1): Last reviewed commit: "Merge remote-tracking branch 'origin/mai..." | Re-trigger Greptile