Merge branch 'main' into match_transport_formula

Author: HumphreyYang

.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"]

.github/workflows/ci.yml

@@ -8,6 +8,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
       - name: Setup Anaconda
         uses: conda-incubator/setup-miniconda@v3
         with:

.github/workflows/publish.yml

@@ -10,6 +10,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
       - name: Setup Anaconda
         uses: conda-incubator/setup-miniconda@v3
         with:
@@ -72,6 +74,32 @@ jobs:
         run: |
           rm -r _build/.doctrees
           jb build lectures --path-output ./
+      # Create HTML archive for release assets
+      - name: Create HTML archive
+        shell: bash -l {0}
+        run: |
+          tar -czf lecture-python-advanced-html-${{ github.ref_name }}.tar.gz -C _build/html .
+          sha256sum lecture-python-advanced-html-${{ github.ref_name }}.tar.gz > html-checksum.txt
+
+          # Create metadata manifest
+          cat > html-manifest.json << EOF
+          {
+            "tag": "${{ github.ref_name }}",
+            "commit": "${{ github.sha }}",
+            "timestamp": "$(date -Iseconds)",
+            "size_mb": $(du -sm _build/html | cut -f1),
+            "file_count": $(find _build/html -type f | wc -l)
+          }
+          EOF
+      - name: Upload archives to release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            lecture-python-advanced-html-${{ github.ref_name }}.tar.gz
+            html-checksum.txt
+            html-manifest.json
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Deploy website to gh-pages
         uses: peaceiris/actions-gh-pages@v4
         with:

.github/workflows/style-guide.yml

@@ -10,10 +10,10 @@ jobs:
     if: contains(github.event.comment.body, '@qe-style-checker')
     runs-on: ubuntu-latest
     steps:
-      - uses: QuantEcon/action-style-guide@v0.3
+      - uses: QuantEcon/action-style-guide@v0.5
         with:
           mode: 'single'
           lectures-path: 'lectures/'
           anthropic-api-key: ${{ secrets.ANTHROPIC_API_KEY }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          comment-body: ${{ github.event.comment.body || github.event.issue.body }}
+          comment-body: ${{ github.event.comment.body || github.event.issue.body }}

environment.yml

@@ -3,17 +3,18 @@ channels:
   - default
 dependencies:
   - python=3.13
-  - anaconda=2025.06
+  - anaconda=2025.12
   - pip
   - pip:
-    - jupyter-book==1.0.4post1
-    - quantecon-book-theme==0.9.3
-    - sphinx-tojupyter==0.3.1
-    - sphinxext-rediraffe==0.2.7
-    - sphinx-exercise==1.0.1
-    - sphinx-proof==0.2.1
+    - jupyter-book>=1.0.4post1,<2.0
+    - quantecon-book-theme==0.15.1
+    - sphinx-tojupyter==0.6.0
+    - sphinxext-rediraffe==0.3.0
+    - sphinx-exercise==1.2.1
+    - sphinx-proof==0.3.0
     - sphinxcontrib-youtube==1.4.1
     - sphinx-togglebutton==0.3.2
-    - sphinx-reredirects==0.1.4
+    - sphinx-reredirects==1.1.0
+    - kaleido
 
 

lectures/BCG_complete_mkts.md

@@ -1194,7 +1194,7 @@ fig.update_layout(width=500,
 fig.update_layout(scene_camera=dict(eye=dict(x=2, y=-2, z=1.5)))
 
 # Export to PNG file
-Image(fig.to_image(format="png"))
+Image(fig.to_image(format="png", engine="kaleido"))
 # fig.show() will provide interactive plot when running
 # notebook locally
 ```

lectures/BCG_incomplete_mkts.md

@@ -1270,7 +1270,7 @@ fig.update_layout(scene_camera=dict(eye=dict(x=1.5, y=-1.5, z=2)))
 fig.update_layout(title='Equilibrium firm valuation for the grid of (k,b)')
 
 # Export to PNG file
-Image(fig.to_image(format="png"))
+Image(fig.to_image(format="png", engine="kaleido"))
 # fig.show() will provide interactive plot when running
 # code locally
 ```
@@ -1634,7 +1634,7 @@ fig.update_layout(title='Equilibrium firm valuation for the grid of (k,b)')
 
 
 # Export to PNG file
-Image(fig.to_image(format="png"))
+Image(fig.to_image(format="png", engine="kaleido"))
 # fig.show() will provide interactive plot when running
 # code locally
 ```
@@ -1685,7 +1685,7 @@ fig.update_layout(scene_camera=dict(eye=dict(x=1.5, y=-1.5, z=2)))
 fig.update_layout(title='Equilibrium firm valuation for the grid of (k,b)')
 
 # Export to PNG file
-Image(fig.to_image(format="png"))
+Image(fig.to_image(format="png", engine="kaleido"))
 # fig.show() will provide interactive plot when running
 # code locally
 ```
@@ -1746,7 +1746,7 @@ fig.update_layout(title='Equilibrium equity valuation for the grid of (k,b)')
 
 
 # Export to PNG file
-Image(fig.to_image(format="png"))
+Image(fig.to_image(format="png", engine="kaleido"))
 # fig.show() will provide interactive plot when running
 # code locally
 ```
@@ -1776,7 +1776,7 @@ fig.update_layout(title='Equilibrium bond valuation for the grid of (k,b)')
 
 
 # Export to PNG file
-Image(fig.to_image(format="png"))
+Image(fig.to_image(format="png", engine="kaleido"))
 # fig.show() will provide interactive plot when running
 # code locally
 ```

lectures/_config.yml

@@ -39,6 +39,7 @@ sphinx:
                        'https://doi.org/10.1086/262078',
                        'https://keras.io/',
                        'https://data.oecd.org/']
+    nb_merge_streams: true
     nb_mime_priority_overrides: [
        # HTML
        ['html', 'application/vnd.jupyter.widget-view+json', 10],
@@ -85,6 +86,7 @@ sphinx:
       header_organisation: QuantEcon
       repository_url: https://github.com/QuantEcon/lecture-python-advanced.myst
       nb_repository_url: https://github.com/QuantEcon/lecture-python-advanced.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
@@ -116,6 +118,8 @@ sphinx:
           "gG": "\\mathcal{G}"
           "hH": "\\mathcal{H}"
     mathjax_path: https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js
+    # sphinx-exercise
+    exercise_style: "solution_follow_exercise"
     rediraffe_redirects:
       index_toc.md: intro.md
     tojupyter_static_file_path: ["source/_static", "_static"]

lectures/_static/.DS_Store

@@ -231,15 +231,15 @@ def objf_prime(x):
 
             epsilon = 1e-7
             x0 = np.asarray(x, dtype=float)
-            f0 = np.atleast_1d(objf(x0))
-            jac = np.zeros([len(x0), len(f0)])
+            f0 = objf(x0)
+            grad = np.zeros(len(x0))
             dx = np.zeros(len(x0))
             for i in range(len(x0)):
                 dx[i] = epsilon
-                jac[i] = (objf(x0+dx) - f0)/epsilon
+                grad[i] = (objf(x0+dx) - f0)/epsilon
                 dx[i] = 0.0
 
-            return jac.transpose()
+            return grad
 
         def cons(z):
             c, n, xprime, T = z[:S], z[S:2 * S], z[2 * S:3 * S], z[3 * S:]