Merge branch 'main' of https://github.com/QuantEcon/lecture-python.myst into cass_fiscal

Author: HumphreyYang

.github/workflows/cache.yml

@@ -1,13 +1,13 @@
 name: Build Cache [using jupyter-book]
 on:
-  push:
-    branches:
-      - main
+  schedule:
+    # Execute cache weekly at 3am on Monday
+    - cron:  '0 3 * * 1'
 jobs:
   cache:
-    runs-on: quantecon-gpu-runner
+    runs-on: quantecon-gpu
     container:
-      image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-06-py312
+      image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-10-py312-b
       options: --gpus all
     steps:
       - uses: actions/checkout@v4
@@ -31,4 +31,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: build-cache
-          path: _build
+          path: _build
+          include-hidden-files: true

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: Build Project [using jupyter-book]
 on: [pull_request]
 jobs:
   preview:
-    runs-on: quantecon-gpu-runner
+    runs-on: quantecon-gpu
     container:
-      image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-06-py312
+      image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-10-py312-b
       options: --gpus all
     steps:
       - uses: actions/checkout@v4
@@ -21,7 +21,7 @@ jobs:
         shell: bash -l {0}
         run: pip list
       - name: Download "build" folder (cache)
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v7
         with:
           workflow: cache.yml
           branch: main
@@ -64,7 +64,7 @@ jobs:
           name: execution-reports
           path: _build/html/reports
       - name: Preview Deploy to Netlify
-        uses: nwtgck/actions-netlify@v3.0
+        uses: nwtgck/actions-netlify@v3
         with:
           publish-dir: '_build/html/'
           production-branch: main

.github/workflows/collab.yml

@@ -0,0 +1,56 @@
+name: Build Project on Google Collab (Execution)
+on: [pull_request]
+jobs:
+  execution-checks:
+    runs-on: quantecon-gpu
+    container:
+      image: docker://us-docker.pkg.dev/colab-images/public/runtime
+      options: --gpus all
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Check nvidia drivers
+        shell: bash -l {0}
+        run: |
+          nvidia-smi
+      - name: Check python version
+        shell: bash -l {0}
+        run: |
+          python --version
+      - name: Display Pip Versions
+        shell: bash -l {0}
+        run: pip list
+      - name: Download "build" folder (cache)
+        uses: dawidd6/action-download-artifact@v7
+        with:
+          workflow: cache.yml
+          branch: main
+          name: build-cache
+          path: _build
+      # Install build software
+      - name: Install Build Software
+        shell: bash -l {0}
+        run: |
+          pip install jupyter-book==0.15.1 docutils==0.17.1 quantecon-book-theme==0.7.2 sphinx-tojupyter==0.3.0 sphinxext-rediraffe==0.2.7 sphinx-reredirects sphinx-exercise==0.4.1 sphinxcontrib-youtube==1.1.0 sphinx-togglebutton==0.3.1 arviz==0.13.0
+      # Build of HTML (Execution Testing)
+      - name: Build HTML
+        shell: bash -l {0}
+        run: |
+          jb build lectures --path-output ./ -n -W --keep-going
+      - name: Upload Execution Reports
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: execution-reports
+          path: _build/html/reports
+      - name: Preview Deploy to Netlify
+        uses: nwtgck/actions-netlify@v3
+        with:
+          publish-dir: '_build/html/'
+          production-branch: main
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          deploy-message: "Preview Deploy from GitHub Actions"
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}

.github/workflows/execution.yml

@@ -27,7 +27,7 @@ jobs:
           environment-file: environment.yml
           activate-environment: quantecon
       - name: Download "build" folder (cache)
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v7
         with:
           workflow: cache.yml
           branch: main

.github/workflows/linkcheck.yml

@@ -6,9 +6,9 @@ on:
 jobs:
   publish:
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-    runs-on: quantecon-gpu-runner
+    runs-on: quantecon-gpu
     container:
-      image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-06-py312
+      image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-10-py312-b
       options: --gpus all
     steps:
       - name: Checkout
@@ -28,7 +28,7 @@ jobs:
         run: pip list
       # Download Build Cache from cache.yml
       - name: Download "build" folder (cache)
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v7
         with:
           workflow: cache.yml
           branch: main
@@ -90,4 +90,4 @@ jobs:
           git config user.email "[email protected]"
           git add *.ipynb
           git commit -m "auto publishing updates to notebooks"
-          git push origin master
+          git push origin main

.github/workflows/publish.yml

@@ -3,20 +3,19 @@ channels:
   - default
 dependencies:
   - python=3.12
-  - anaconda=2024.06
+  - anaconda=2024.10
   - pip
   - pip:
-    - jupyter-book==0.15.1
-    - docutils==0.17.1
-    - quantecon-book-theme==0.7.1
-    - sphinx-reredirects==0.1.3
+    - jupyter-book==1.0.3
+    - quantecon-book-theme==0.7.6
     - sphinx-tojupyter==0.3.0
     - sphinxext-rediraffe==0.2.7
-    - sphinx-exercise==0.4.1
-    - ghp-import==2.1.0
-    - sphinxcontrib-youtube==1.2.0
+    - 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
-    - arviz==0.13.0
-    - kaleido
     # Docker Requirements
     - pytz
+

environment.yml

@@ -34,6 +34,8 @@ latex:
 sphinx:
   extra_extensions: [sphinx_multitoc_numbering, sphinxext.rediraffe, sphinx_tojupyter, sphinxcontrib.youtube, sphinx.ext.todo, sphinx_exercise, sphinx_proof, sphinx_togglebutton, sphinx.ext.intersphinx, sphinx_reredirects]
   config:
+    # false-positive links
+    linkcheck_ignore: ['https://online.stat.psu.edu/stat415/book/export/html/834']
     bibtex_reference_style: author_year
     nb_mime_priority_overrides: [
        # HTML

lectures/_config.yml

@@ -10,7 +10,7 @@ kernelspec:
 ---
 
 (aiyagari)=
-```{raw} html
+```{raw} jupyter
 <div id="qe-notebook-header" align="right" style="text-align:right;">
         <a href="https://quantecon.org/" title="quantecon.org">
                 <img style="width:250px;display:inline;" width="250px" src="https://assets.quantecon.org/img/qe-menubar-logo.svg" alt="QuantEcon">
@@ -283,7 +283,7 @@ class Household:
 
 # Do the hard work using JIT-ed functions
 
-@jit(nopython=True)
+@jit
 def populate_R(R, a_size, z_size, a_vals, z_vals, r, w):
     n = a_size * z_size
     for s_i in range(n):
@@ -297,7 +297,7 @@ def populate_R(R, a_size, z_size, a_vals, z_vals, r, w):
             if c > 0:
                 R[s_i, new_a_i] = np.log(c)  # Utility
 
-@jit(nopython=True)
+@jit
 def populate_Q(Q, a_size, z_size, Π):
     n = a_size * z_size
     for s_i in range(n):
@@ -307,7 +307,7 @@ def populate_Q(Q, a_size, z_size, Π):
                 Q[s_i, a_i, a_i*z_size + next_z_i] = Π[z_i, next_z_i]
 
 
-@jit(nopython=True)
+@jit
 def asset_marginal(s_probs, a_size, z_size):
     a_probs = np.zeros(a_size)
     for a_i in range(a_size):

lectures/aiyagari.md

@@ -408,7 +408,7 @@ $$
 ```{code-cell} ipython3
 import numpy as np
 import matplotlib.pyplot as plt
-from numba import njit
+from numba import jit
 from quantecon.optimize import brent_max
 ```
 
@@ -433,22 +433,22 @@ Knowing $\hat K$, we can calculate other equilibrium objects.
 Let's first define  some Python helper functions.
 
 ```{code-cell} ipython3
-@njit
+@jit
 def K_to_Y(K, α):
 
     return K ** α
 
-@njit
+@jit
 def K_to_r(K, α):
 
     return α * K ** (α - 1)
 
-@njit
+@jit
 def K_to_W(K, α):
 
     return (1 - α) * K ** α
 
-@njit
+@jit
 def K_to_C(K, D, τ, r, α, β):
 
     # optimal consumption for the old when δ=0
@@ -913,7 +913,7 @@ Let's implement this "guess and verify" approach
 We start by defining the Cobb-Douglas utility function
 
 ```{code-cell} ipython3
-@njit
+@jit
 def U(Cy, Co, β):
 
     return (Cy ** β) * (Co ** (1-β))
@@ -924,7 +924,7 @@ We use `Cy_val` to compute the lifetime value of an arbitrary consumption plan,
 Note that it requires knowing future prices $r_{t+1}$ and tax rate $\tau_{t+1}$.
 
 ```{code-cell} ipython3
-@njit
+@jit
 def Cy_val(Cy, W, r_next, τ, τ_next, δy, δo_next, β):
 
     # Co given by the budget constraint