Skip to content

chore(quantecon): sync main with upstream@1.9.1#38

Merged
mmcky merged 7 commits into
mainfrom
chore/sync-upstream-1.9.1
May 20, 2026
Merged

chore(quantecon): sync main with upstream@1.9.1#38
mmcky merged 7 commits into
mainfrom
chore/sync-upstream-1.9.1

Conversation

@mmcky
Copy link
Copy Markdown

@mmcky mmcky commented May 20, 2026

Summary

Pulls in 5 commits from jupyter-book/mystmd:main, including the mystmd@1.9.1 release, and bumps quantecon/VERSION.yml upstream_base: 1.9.0 → 1.9.1 to match.

Upstream commits pulled in

Merge was clean (auto-resolution on packages/myst-cli/package.json only — no conflicts).

⚠️ Merge strategy: use "Create a merge commit", NOT squash

This PR contains a real merge commit (483967e9) preserving upstream/main ancestry. Per quantecon/README.md §"Sync main with upstream" and the warning commit 8522235:

If main is branch-protected and the sync has to go through a PR, choose "Create a merge commit" when merging — never "Squash and merge". A real merge commit preserves the ancestry so git merge upstream/main works cleanly next time.

Squash-merging here would rewrite the upstream commits to a new SHA, break the ancestry, and stick the "N behind" counter — every future sync would emit a near-empty merge commit until reconciled.

Test plan

  • git merge upstream/main on a fresh branch produced no conflicts
  • quantecon/VERSION.yml upstream_base matches upstream's packages/mystmd/package.json version (1.9.1)
  • After merge: git fetch upstream && git merge-base --is-ancestor upstream/main origin/main exits 0 (ancestry preserved — i.e. the merge strategy was correct)

🤖 Generated with Claude Code

choldgraf and others added 7 commits May 16, 2026 12:57
* Await connection end for jupyter kernel

* Add changeset for myst-execute patch

Add a changeset for patching myst-execute with a note on awaiting connection end for the Jupyter kernel.
Reflects the mystmd@1.9.1 release pulled in via the upstream/main merge.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings May 20, 2026 01:51
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Syncs QuantEcon’s fork with jupyter-book/mystmd upstream release v1.9.1, updating version metadata across packages and incorporating the upstream patch that awaits Jupyter kernel shutdown completion.

Changes:

  • Bump package versions and internal dependency ranges to 1.9.1 (and myst-execute to 0.3.5) plus corresponding changelog entries.
  • Update kernel execution cleanup to await Jupyter session shutdown.
  • Document logo_dark site option and fix a spelling typo in developer docs.

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
quantecon/VERSION.yml Updates upstream_base to 1.9.1 to match the synced upstream release.
packages/mystmd/package.json Bumps mystmd to 1.9.1 and updates dependency on myst-cli.
packages/mystmd/CHANGELOG.md Adds 1.9.1 changelog entry.
packages/myst-migrate/package.json Bumps myst-migrate to 1.9.1.
packages/myst-migrate/CHANGELOG.md Adds 1.9.1 heading.
packages/myst-execute/src/transform.ts Awaits Jupyter session shutdown during kernel execution teardown.
packages/myst-execute/package.json Bumps myst-execute to 0.3.5.
packages/myst-execute/CHANGELOG.md Adds 0.3.5 changelog entry.
packages/myst-cli/package.json Bumps myst-cli to 1.9.1 and updates deps on myst-migrate / myst-execute.
packages/myst-cli/CHANGELOG.md Adds 1.9.1 changelog entry.
docs/website-templates.md Documents logo_dark in site.options.
docs/developer.md Fixes typo (“intentionally”).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines 167 to 171
} finally {
// Ensure that we shut-down the kernel
if (!sessionConnection.isDisposed) {
sessionConnection.shutdown();
await sessionConnection.shutdown();
}
@mmcky mmcky merged commit 650c686 into main May 20, 2026
9 checks passed
@mmcky mmcky deleted the chore/sync-upstream-1.9.1 branch May 20, 2026 02:13
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.

5 participants