From 6e4576cb6b50a72b0ea180fb02cec2b66ba68299 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Thu, 9 Apr 2026 15:13:43 +1000 Subject: [PATCH] UPD: upgrade dependencies to align with lecture-python-intro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Python 3.12 → 3.13, anaconda 2024.10 → 2025.12 - jupyter-book 1.0.3 → 1.0.4post1 - sphinx-tojupyter 0.3.0 → 0.6.0 - sphinxext-rediraffe 0.2.7 → 0.3.0 - sphinx-reredirects 0.1.4 → 1.1.0 - sphinx-exercise 1.0.1 → 1.2.1 - sphinx-proof 0.2.0 → 0.4.0 - sphinxcontrib-youtube 1.3.0 → 1.5.0 - sphinx-togglebutton 0.3.2 → 0.4.5 - Remove ghp-import (no longer needed) - Add nb_merge_streams and path_to_docs to _config.yml - Add conda ecosystem to dependabot - Update Python version in all remaining CI workflows --- .github/dependabot.yml | 13 +++++++++++++ .github/workflows/cache.yml | 2 +- .github/workflows/ci-cn.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/publish.yml | 2 +- environment-cn.yml | 21 ++++++++++----------- environment.yml | 21 ++++++++++----------- lectures/_config.yml | 2 ++ 8 files changed, 39 insertions(+), 26 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7809c2a9..04804108 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,3 +11,16 @@ updates: prefix: ⬆️ schedule: interval: weekly + + - package-ecosystem: "conda" + directory: "/" + commit-message: + prefix: ⬆️ + schedule: + interval: weekly + ignore: + - dependency-name: "jupyter-book" + versions: [">=2.0"] + - dependency-name: "python" + # Python version should be constrained by the anaconda distribution version + versions: [">0"] 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.yml b/.github/workflows/ci.yml index 918e6633..c9c072b9 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/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 diff --git a/environment-cn.yml b/environment-cn.yml index 3640e08f..97d324a8 100644 --- a/environment-cn.yml +++ b/environment-cn.yml @@ -3,18 +3,17 @@ channels: - default - conda-forge dependencies: - - python=3.12 - - anaconda=2024.10 + - python=3.13 + - anaconda=2025.12 - pip - pip: - - jupyter-book==1.0.3 + - jupyter-book==1.0.4post1 - quantecon-book-theme==0.20.2 - - sphinx-tojupyter==0.3.0 - - sphinxext-rediraffe==0.2.7 - - sphinx_reredirects==0.1.4 - - sphinx-exercise==1.0.1 - - sphinx-proof==0.2.0 - - ghp-import==1.1.0 - - sphinxcontrib-youtube==1.3.0 #Version 1.3.0 is required as quantecon-book-theme is only compatible with sphinx<=5 - - sphinx-togglebutton==0.3.2 + - sphinx-tojupyter==0.6.0 + - sphinxext-rediraffe==0.3.0 + - sphinx_reredirects==1.1.0 + - sphinx-exercise==1.2.1 + - sphinx-proof==0.4.0 + - sphinxcontrib-youtube==1.5.0 + - sphinx-togglebutton==0.4.5 - --index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple diff --git a/environment.yml b/environment.yml index cb5d7102..c6d71286 100644 --- a/environment.yml +++ b/environment.yml @@ -2,18 +2,17 @@ name: quantecon channels: - default dependencies: - - python=3.12 - - anaconda=2024.10 + - python=3.13 + - anaconda=2025.12 - pip - pip: - - jupyter-book==1.0.3 + - jupyter-book==1.0.4post1 - quantecon-book-theme==0.20.2 - - sphinx-tojupyter==0.3.0 - - sphinxext-rediraffe==0.2.7 - - sphinx-reredirects==0.1.4 - - sphinx-exercise==1.0.1 - - sphinx-proof==0.2.0 - - ghp-import==1.1.0 - - sphinxcontrib-youtube==1.3.0 #Version 1.3.0 is required as quantecon-book-theme is only compatible with sphinx<=5 - - sphinx-togglebutton==0.3.2 + - sphinx-tojupyter==0.6.0 + - sphinxext-rediraffe==0.3.0 + - sphinx-reredirects==1.1.0 + - sphinx-exercise==1.2.1 + - sphinx-proof==0.4.0 + - sphinxcontrib-youtube==1.5.0 + - sphinx-togglebutton==0.4.5 diff --git a/lectures/_config.yml b/lectures/_config.yml index 134ce0e9..4dc154c9 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 languages: - code: en