From d68ab8ea923a5e2ec0231c488510fcacf0d40ab9 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Mon, 22 Dec 2025 12:07:08 +1100 Subject: [PATCH 1/2] =?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 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 | 6 +++--- lectures/_config.yml | 2 ++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7809c2a..bb2ad36 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 820b75e..8154029 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,13 +33,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 # TODO: enable pdf and download notebooks # # Build Assets (Download Notebooks and PDF via LaTeX) # - name: Build Download Notebooks (sphinx-tojupyter) diff --git a/environment.yml b/environment.yml index d75357c..11b7287 100644 --- a/environment.yml +++ b/environment.yml @@ -3,11 +3,11 @@ channels: - default dependencies: - python=3.13 - - anaconda=2025.06 + - anaconda=2025.12 - pip - pip: - - jupyter-book==1.0.4post1 - - quantecon-book-theme==0.14.0 + - jupyter-book>=1.0.4post1,<2.0 + - quantecon-book-theme==0.15.1 - sphinx-tojupyter==0.6.0 - sphinxext-rediraffe==0.2.7 - sphinx-exercise==1.2.1 diff --git a/lectures/_config.yml b/lectures/_config.yml index 02a385d..32a45e7 100644 --- a/lectures/_config.yml +++ b/lectures/_config.yml @@ -27,6 +27,7 @@ sphinx: 'https://www.reddit.com/', 'https://openai.com', 'https://chatgpt.com/'] + nb_merge_streams: true html_favicon: _static/lectures-favicon.ico html_theme: quantecon_book_theme html_static_path: ['_static'] @@ -41,6 +42,7 @@ sphinx: header_organisation: QuantEcon repository_url: https://github.com/QuantEcon/lecture-python-programming.fa nb_repository_url: https://github.com/QuantEcon/lecture-python-programming.fa.notebooks + path_to_docs: lectures twitter: quantecon twitter_logo_url: https://assets.quantecon.org/img/qe-twitter-logo.png og_logo_url: https://assets.quantecon.org/img/qe-og-logo.png From d3df14ea65ff22856d022d2c23c3bba995279933 Mon Sep 17 00:00:00 2001 From: Matt McKay Date: Mon, 22 Dec 2025 15:36:24 +1100 Subject: [PATCH 2/2] Re-enable build cache after full execution checks --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8154029..820b75e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,13 +33,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 # TODO: enable pdf and download notebooks # # Build Assets (Download Notebooks and PDF via LaTeX) # - name: Build Download Notebooks (sphinx-tojupyter)