Skip to content

Align build environment with the English source (supersedes the env half of #97)#165

Merged
mmcky merged 1 commit into
mainfrom
phase0/env-align-source
Jul 18, 2026
Merged

Align build environment with the English source (supersedes the env half of #97)#165
mmcky merged 1 commit into
mainfrom
phase0/env-align-source

Conversation

@mmcky

@mmcky mmcky commented Jul 18, 2026

Copy link
Copy Markdown
Contributor

Copies lecture-python.myst's current environment.yml (anaconda 2026.06, jupyter-book >=1.0.4post1,<2.0, quantecon-book-theme 0.21.0, sphinx-tojupyter 0.6.0, current sphinx-* pins) and adds the source's nb_merge_streams: true to _config.yml. The Track B resync wave (#101#164) brings lecture code to the source's 2026-era state — it should build against the same stack the source executes under, not the 2025.06 pins on main.

Relationship to #97: that PR was current when opened in December (anaconda 2025.12 / theme 0.15.1) but is now seven months behind the source. This PR supersedes its environment/config changes; #97's remaining pieces (dependabot config, workflow action-version bumps) are untouched here and can still be merged or cherry-picked — Matt's call whether to rebase #97 down to those or close it.

Not touched: environment-cn.yml — no workflow references it (all three use environment.yml); consider deleting it separately as dead config.

After merging: dispatch the cache workflow so the execution cache rebuilds under the new environment, then re-run wave-PR checks.

🤖 Generated with Claude Code

environment.yml copied from lecture-python.myst (anaconda 2026.06,
jupyter-book <2.0, quantecon-book-theme 0.21.0, sphinx-tojupyter 0.6.0
and current sphinx-* pins) so the resynced 2026-era lecture code builds
against the same stack the source executes under. Adds the source's
nb_merge_streams setting to _config.yml.

Supersedes the environment half of #97 (which pinned anaconda 2025.12 /
theme 0.15.1 — current in December, seven months behind now).

Part of Phase 0 Track B, QuantEcon/lecture-python.myst#947.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings July 18, 2026 10:04
@netlify

netlify Bot commented Jul 18, 2026

Copy link
Copy Markdown

Deploy Preview for astonishing-narwhal-a8fc64 ready!

Name Link
🔨 Latest commit 21ca355
🔍 Latest deploy log https://app.netlify.com/projects/astonishing-narwhal-a8fc64/deploys/6a5b4fbe18d4430008c6c952
😎 Deploy Preview https://deploy-preview-165--astonishing-narwhal-a8fc64.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Aligns the Chinese lecture build stack with the current lecture-python.myst English source so the 2026-era resync wave can build and execute under the same dependency set.

Changes:

  • Add nb_merge_streams: true to the JupyterBook/Sphinx config to match upstream execution/output handling.
  • Update environment.yml to anaconda 2026.06 and refresh/pin the upstream Sphinx/JupyterBook/theme-related pip dependencies (including a jupyter-book version range).

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
lectures/_config.yml Adds nb_merge_streams: true under sphinx.config to match upstream notebook output behavior.
environment.yml Updates the conda/pip environment pins to match the upstream build environment (anaconda 2026.06 + updated Sphinx/JupyterBook ecosystem pins).

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

@github-actions

Copy link
Copy Markdown

@github-actions
github-actions Bot temporarily deployed to pull request July 18, 2026 10:16 Inactive
@mmcky
mmcky merged commit 4fc132f into main Jul 18, 2026
7 checks passed
@mmcky
mmcky deleted the phase0/env-align-source branch July 18, 2026 10:27
mmcky added a commit that referenced this pull request Jul 18, 2026
#97) (#166)

* CI hardening: strict builds, conda dependabot, missing wald_dec_rule.png

Carries forward the pieces of #97 that #165 did not supersede:

- jb build gains '-n -W --keep-going' in cache/ci/publish workflows,
  matching the English source repos' strict-build convention
- dependabot watches the conda ecosystem (jupyter-book pinned <2.0,
  python constrained by the anaconda distribution)
- wald_dec_rule.png copied from the source repo (referenced by
  wald_friedman_2 but absent here - a warning today, an error under -W)

Dropped from #97 as obsolete: the lecture-code fixes (regenerated by the
Track B resync wave or applied directly to its branches) and the ogm.py
tweak (optgrowth_fast was removed in #99).

Part of Phase 0 Track B, QuantEcon/lecture-python.myst#947.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* Fix the two main-content strict-build breaks: mix_model import, cass_fiscal ref

mix_model kept a CJK font-config block without the mpl import it needs
(same class as the five wave-branch fixes; mix_model was skipped by the
wave so the pre-existing bug stayed on main). cass_fiscal's note pointed
{doc} at a document that never existed; replaced with the wave branch's
exact {ref}`growth_model` sentence so the resync PR merges cleanly over
it. newton_method's two iref_ambiguous warnings are NOT patched here:
old main lacks the local anchors, and the resync PR (#140) adds them -
merging #140 resolves those warnings without conflict-prone edits.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
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.

2 participants