From 334fee11fb02155fcc1e8a8c6c36aa7f5a4caf32 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Mon, 22 Dec 2025 12:09:50 +1100 Subject: [PATCH 1/5] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20build=20soft?= =?UTF-8?q?ware=20and=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Upgrade python to 3.13 - Upgrade anaconda to 2025.12 - Upgrade quantecon-book-theme to 0.15.1 - Add jupyter-book version constraint (<2.0) - Configure Dependabot for conda ecosystem with jupyter-book restriction - Add nb_merge_streams and path_to_docs to _config.yml - Temporarily disable build cache for full execution check --- .github/dependabot.yml | 10 ++++++++++ .github/workflows/ci.yml | 14 +++++++------- environment.yml | 8 ++++---- lectures/_config.yml | 2 ++ 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7809c2a9..bb2ad36d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,3 +11,13 @@ updates: prefix: ⬆️ schedule: interval: weekly + + - package-ecosystem: "conda" + directory: "/" + commit-message: + prefix: ⬆️ + schedule: + interval: weekly + ignore: + - dependency-name: "jupyter-book" + versions: [">=2.0"] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b6cb29e..edef27b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,13 +37,13 @@ jobs: - name: Display Pip Versions shell: bash -l {0} run: pip list - - name: Download "build" folder (cache) - uses: dawidd6/action-download-artifact@v11 - with: - workflow: cache.yml - branch: main - name: build-cache - path: _build + # - name: Download "build" folder (cache) + # uses: dawidd6/action-download-artifact@v11 + # with: + # workflow: cache.yml + # branch: main + # name: build-cache + # path: _build # # Build Assets (Download Notebooks and PDF via LaTeX) # - name: Build PDF from LaTeX # shell: bash -l {0} diff --git a/environment.yml b/environment.yml index fa86041a..c0d26ddd 100644 --- a/environment.yml +++ b/environment.yml @@ -2,12 +2,12 @@ name: quantecon channels: - default dependencies: - - python=3.12 - - anaconda=2024.10 + - python=3.13 + - anaconda=2025.12 - pip - pip: - - jupyter-book==1.0.3 - - quantecon-book-theme==0.8.2 + - jupyter-book>=1.0.4post1,<2.0 + - quantecon-book-theme==0.15.1 - sphinx-tojupyter==0.3.0 - sphinxext-rediraffe==0.2.7 - sphinx-reredirects==0.1.4 diff --git a/lectures/_config.yml b/lectures/_config.yml index cc60f508..83ea53d2 100644 --- a/lectures/_config.yml +++ b/lectures/_config.yml @@ -47,6 +47,7 @@ sphinx: nb_render_image_options: width: 80% nb_code_prompt_show: "Show {type}" + nb_merge_streams: true suppress_warnings: [mystnb.unknown_mime_type, myst.domains] # ------------- html_js_files: @@ -65,6 +66,7 @@ sphinx: header_organisation: QuantEcon repository_url: https://github.com/QuantEcon/lecture-intro.zh-cn nb_repository_url: https://github.com/QuantEcon/lecture-intro.zh-cn.notebooks + path_to_docs: lectures download_nb_path: https://quantecon.github.io/lecture-intro.zh-cn twitter: quantecon twitter_logo_url: https://assets.quantecon.org/img/qe-twitter-logo.png From f14b8b4cf926c3649b3dd7afb8e56ebe1c52603a Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Mon, 22 Dec 2025 15:40:05 +1100 Subject: [PATCH 2/5] Update Python version to 3.13 in all workflows --- .github/workflows/cache-windows.yml | 2 +- .github/workflows/cache.yml | 2 +- .github/workflows/ci-cn.yml | 2 +- .github/workflows/ci-windows.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/linkcheck.yml | 4 ++-- .github/workflows/publish.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cache-windows.yml b/.github/workflows/cache-windows.yml index cfeb245f..0b0ec475 100644 --- a/.github/workflows/cache-windows.yml +++ b/.github/workflows/cache-windows.yml @@ -17,7 +17,7 @@ jobs: auto-update-conda: true auto-activate-base: true miniconda-version: 'latest' - python-version: "3.12" + python-version: "3.13" environment-file: environment.yml activate-environment: quantecon - name: Build HTML diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml index 3529b4ef..e0b3fbb3 100644 --- a/.github/workflows/cache.yml +++ b/.github/workflows/cache.yml @@ -15,7 +15,7 @@ jobs: auto-update-conda: true auto-activate-base: true miniconda-version: 'latest' - python-version: "3.12" + python-version: "3.13" environment-file: environment.yml activate-environment: quantecon - name: graphviz Support # TODO: required? diff --git a/.github/workflows/ci-cn.yml b/.github/workflows/ci-cn.yml index 837f0f62..ed9e3559 100644 --- a/.github/workflows/ci-cn.yml +++ b/.github/workflows/ci-cn.yml @@ -12,7 +12,7 @@ jobs: auto-update-conda: true auto-activate-base: true miniconda-version: 'latest' - python-version: "3.12" + python-version: "3.13" environment-file: environment-cn.yml activate-environment: quantecon - name: Graphics Support diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index d899a909..b71625ac 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -12,7 +12,7 @@ jobs: auto-update-conda: true auto-activate-base: true miniconda-version: 'latest' - python-version: "3.12" + python-version: "3.13" environment-file: environment.yml activate-environment: quantecon - name: Download "build" folder (cache) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c1edcf9..fbc3fa2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: auto-update-conda: true auto-activate-base: true miniconda-version: 'latest' - python-version: "3.12" + python-version: "3.13" environment-file: environment.yml activate-environment: quantecon - name: Graphics Support #TODO: Review if graphviz is needed diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml index a9c8ada1..a693db65 100644 --- a/.github/workflows/linkcheck.yml +++ b/.github/workflows/linkcheck.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest"] - python-version: ["3.12"] + python-version: ["3.13"] steps: - name: Checkout uses: actions/checkout@v6 @@ -23,7 +23,7 @@ jobs: auto-update-conda: true auto-activate-base: true miniconda-version: 'latest' - python-version: "3.12" + python-version: "3.13" environment-file: environment.yml activate-environment: quantecon - name: Download "build" folder (cache) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index bd555752..1d4ca591 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,7 +16,7 @@ jobs: auto-update-conda: true auto-activate-base: true miniconda-version: 'latest' - python-version: "3.12" + python-version: "3.13" environment-file: environment.yml activate-environment: quantecon - name: Install latex dependencies From 55d6b5781b7b9fadebd46b4f823a78a9d852df71 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Mon, 22 Dec 2025 17:08:36 +1100 Subject: [PATCH 3/5] Fix Python version mismatch in ci-cn.yml Change python-version from 3.13 to 3.12 to match environment-cn.yml. Fixes PackagesNotFoundError for python 3.13 in CN build. --- .github/workflows/ci-cn.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-cn.yml b/.github/workflows/ci-cn.yml index ed9e3559..837f0f62 100644 --- a/.github/workflows/ci-cn.yml +++ b/.github/workflows/ci-cn.yml @@ -12,7 +12,7 @@ jobs: auto-update-conda: true auto-activate-base: true miniconda-version: 'latest' - python-version: "3.13" + python-version: "3.12" environment-file: environment-cn.yml activate-environment: quantecon - name: Graphics Support From 6c9f638a49c5e0dab4ac3f33e3b107e62bee3d8e Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Tue, 23 Dec 2025 13:05:37 +1100 Subject: [PATCH 4/5] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Configure=20dependabot?= =?UTF-8?q?=20to=20ignore=20Python=20version=20updates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Python version should be constrained by the anaconda distribution version specified in environment.yml, not updated independently by dependabot. --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bb2ad36d..1ab7ca35 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -21,3 +21,5 @@ updates: ignore: - dependency-name: "jupyter-book" versions: [">=2.0"] + - dependency-name: "python" + # Python version should be constrained by the anaconda distribution version From d6dfe1b661384cc135643f765e5a680c37644ac8 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Tue, 23 Dec 2025 14:21:16 +1100 Subject: [PATCH 5/5] Fix dependabot python ignore rule to include versions constraint --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1ab7ca35..04804108 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -23,3 +23,4 @@ updates: versions: [">=2.0"] - dependency-name: "python" # Python version should be constrained by the anaconda distribution version + versions: [">0"]