Skip to content

chore: back-merge release 0.11.7 into next#387

Merged
smoreinis merged 2 commits into
nextfrom
chore/back-merge-0.11.7-into-next
Jun 1, 2026
Merged

chore: back-merge release 0.11.7 into next#387
smoreinis merged 2 commits into
nextfrom
chore/back-merge-0.11.7-into-next

Conversation

@smoreinis
Copy link
Copy Markdown
Contributor

@smoreinis smoreinis commented Jun 1, 2026

Why

Release PR #386 (release: 0.11.8) is showing CONFLICTING/DIRTY. The 0.11.7 release PR (#382) was squash-merged into main (this repo is squash-only), creating commit 845c8d4b that next has no ancestry to. Because git's 3-way merge has no shared ancestor for that content, next and main conflict on every file 0.11.7 touched — version/changelog metadata plus span_queue.py, init.py, test_span_queue.py.

This is a true merge commit (not squash), so 845c8d4b becomes a genuine ancestor of next, clearing the divergence and the #386 conflicts.

What

  • Merges main (0.11.7, 845c8d4b) into next.
  • Version metadata advanced to 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.7 release entry.
  • Source conflicts (span_queue.py) resolved in favor of next — next is a strict superset (same START/END dispatch logic + tracing telemetry). init.py / test_span_queue.py were 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 instructions

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_commit was temporarily enabled for this; restore squash-only after merging.

Greptile Summary

This is a back-merge of the 0.11.7 release from main into next, restoring shared git ancestry so the pending 0.11.8 release PR (#386) can merge cleanly. All source files are byte-identical to next; only release metadata changes.

  • pyproject.toml, src/agentex/_version.py, and .release-please-manifest.json all advance from 0.11.60.11.7 consistently.
  • CHANGELOG.md gains the ## 0.11.7 section (OpenAI Agents SDK examples + bounded-concurrency span export) while keeping the existing ## Unreleased tracing-metrics entry for the upcoming 0.11.8 release.

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

Filename Overview
.release-please-manifest.json Version bumped from 0.11.6 to 0.11.7 to align manifest with the back-merged release.
CHANGELOG.md 0.11.7 release section inserted between Unreleased and 0.11.6; Unreleased tracing-metrics content preserved for the upcoming 0.11.8 release.
pyproject.toml Package version bumped from 0.11.6 to 0.11.7; no other changes.
src/agentex/_version.py Generated version file updated from 0.11.6 to 0.11.7, consistent with pyproject.toml and manifest.

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 cleared
Loading

Reviews (1): Last reviewed commit: "Merge remote-tracking branch 'origin/mai..." | Re-trigger Greptile

stainless-app Bot and others added 2 commits June 1, 2026 17:37
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
@smoreinis smoreinis merged commit 8b3b1bf into next Jun 1, 2026
41 checks passed
@smoreinis smoreinis deleted the chore/back-merge-0.11.7-into-next branch June 1, 2026 23:15
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