Merge branch 'update-olg' of https://github.com/QuantEcon/lecture-python-intro into update-olg

Author: jstac

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 name: Build HTML [using jupyter-book]
-on: [push]
+on: [pull_request]
 jobs:
-  tests:
+  preview:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -51,12 +51,12 @@ jobs:
       #     jb build lectures --builder pdflatex --path-output ./ -n --keep-going
       #     mkdir -p _build/html/_pdf
       #     cp -u _build/latex/*.pdf _build/html/_pdf
-      # - name: Build Download Notebooks (sphinx-tojupyter)
-      #   shell: bash -l {0}
-      #   run: |
-      #     jb build lectures --path-output ./ --builder=custom --custom-builder=jupyter
-      #     mkdir -p _build/html/_notebooks
-      #     cp -u _build/jupyter/*.ipynb _build/html/_notebooks
+      - name: Build Download Notebooks (sphinx-tojupyter)
+        shell: bash -l {0}
+        run: |
+          jb build lectures --path-output ./ --builder=custom --custom-builder=jupyter
+          mkdir -p _build/html/_notebooks
+          cp -u _build/jupyter/*.ipynb _build/html/_notebooks
       # Build HTML (Website)
       # BUG: rm .doctress to remove `sphinx` rendering issues for ipywidget mimetypes
       # and clear the sphinx cache for building final HTML documents.

.github/workflows/publish.yml

@@ -55,15 +55,15 @@ jobs:
       #   run: |
       #     mkdir -p _build/html/_pdf
       #     cp -u _build/latex/*.pdf _build/html/_pdf
-      # - name: Build Download Notebooks (sphinx-tojupyter)
-      #   shell: bash -l {0}
-      #   run: |
-      #     jb build lectures --path-output ./ --builder=custom --custom-builder=jupyter
-      # - name: Copy Download Notebooks for GH-PAGES
-      #   shell: bash -l {0}
-      #   run: |
-      #     mkdir -p _build/html/_notebooks
-      #     cp -u _build/jupyter/*.ipynb _build/html/_notebooks
+      - name: Build Download Notebooks (sphinx-tojupyter)
+        shell: bash -l {0}
+        run: |
+          jb build lectures --path-output ./ --builder=custom --custom-builder=jupyter
+      - name: Copy Download Notebooks for GH-PAGES
+        shell: bash -l {0}
+        run: |
+          mkdir -p _build/html/_notebooks
+          cp -u _build/jupyter/*.ipynb _build/html/_notebooks
       # Build HTML (Website)
       # BUG: rm .doctress to remove `sphinx` rendering issues for ipywidget mimetypes
       # and clear the sphinx cache for building final HTML documents.
@@ -82,32 +82,33 @@ jobs:
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-      # - name: Deploy website to gh-pages
-      #   uses: peaceiris/actions-gh-pages@v3
-      #   with:
-      #     github_token: ${{ secrets.GITHUB_TOKEN }}
-      #     publish_dir: _build/html/
+      - name: Deploy website to gh-pages
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: _build/html/
           # cname: intro.quantecon.org
       - name: Upload "_build" folder (cache)
         uses: actions/upload-artifact@v2
         with:
           name: build-publish
           path: _build
-      # - name: Prepare lecture-python-intro.notebooks sync
-      #   shell: bash -l {0}
-      #   run: |
-      #     mkdir -p _build/lecture-python-intro.notebooks
-      #     cp -a _notebook_repo/. _build/lecture-python-intro.notebooks
-      #     cp _build/jupyter/*.ipynb _build/lecture-python-intro.notebooks
-      #     ls -a _build/lecture-python-intro.notebooks
-      # - name: Commit latest notebooks to lecture-python-intro.notebooks
-      #   uses: cpina/github-action-push-to-another-repository@master
-      #   env:
-      #     API_TOKEN_GITHUB: ${{ secrets.QUANTECON_SERVICES_PAT }}
-      #   with:
-      #     source-directory: '_build/lecture-python-intro.notebooks/'
-      #     destination-repository-username: 'QuantEcon'
-      #     destination-repository-name: 'lecture-python-intro.notebooks'
-      #     commit-message: 'auto publishing updates to notebooks'
-      #     destination-github-username: 'quantecon-services'
-      #     user-email: services@quantecon.org
+      # Sync notebooks
+      - name: Prepare lecture-python-intro.notebooks sync
+        shell: bash -l {0}
+        run: |
+          mkdir -p _build/lecture-python-intro.notebooks
+          cp -a _notebook_repo/. _build/lecture-python-intro.notebooks
+          cp _build/jupyter/*.ipynb _build/lecture-python-intro.notebooks
+          ls -a _build/lecture-python-intro.notebooks
+      - name: Commit latest notebooks to lecture-python-intro.notebooks
+        uses: cpina/github-action-push-to-another-repository@main
+        env:
+          API_TOKEN_GITHUB: ${{ secrets.QUANTECON_SERVICES_PAT }}
+        with:
+          source-directory: '_build/lecture-python-intro.notebooks/'
+          destination-repository-username: 'QuantEcon'
+          destination-repository-name: 'lecture-python-intro.notebooks'
+          commit-message: 'auto publishing updates to notebooks'
+          destination-github-username: 'quantecon-services'
+          user-email: services@quantecon.org

_notebook_repo/README.md

@@ -0,0 +1,7 @@
+# lecture-python-intro.notebooks
+
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/QuantEcon/lecture-python-intro.notebooks/master)
+
+<!-- Notebooks for https://python-intro.quantecon.org -->
+
+**Note:** This README should be edited [here](https://github.com/quantecon/lecture-python-intro/_notebook_repo)

_notebook_repo/environment.yml

@@ -0,0 +1,7 @@
+name: lecture-python-intro
+channels:
+  - default
+dependencies:
+  - python=3.10
+  - anaconda=2023.03
+

environment.yml

@@ -8,7 +8,7 @@ dependencies:
   - pip:
     - jupyter-book==0.15.1
     - docutils==0.17.1
-    - quantecon-book-theme==0.4.1
+    - quantecon-book-theme==0.4.2
     - sphinx-tojupyter==0.3.0
     - sphinxext-rediraffe==0.2.7
     - sphinx-exercise==0.4.1

lectures/_config.yml

@@ -17,10 +17,12 @@ parse:
     - substitution
     - tasklist
 
+only_build_toc_files: true
 execute:
   execute_notebooks: "cache"
   timeout: 600 # 10 minutes
-#   run_in_temp: true
+  exclude_patterns:
+    - '_static/*'
 
 html:
   baseurl: https://intro.quantecon.org/
@@ -33,21 +35,21 @@ latex:
     targetname: quantecon-python-intro.tex
 
 sphinx:
-  extra_extensions: [sphinx_multitoc_numbering, sphinxext.rediraffe, sphinx_exercise, sphinx_togglebutton, sphinx_proof] # sphinx_tojupyter
+  extra_extensions: [sphinx_multitoc_numbering, sphinxext.rediraffe, sphinx_exercise, sphinx_togglebutton, sphinx_proof, sphinx_tojupyter] 
   config:
     html_favicon: _static/lectures-favicon.ico
     html_theme: quantecon_book_theme
     html_static_path: ['_static']
     html_theme_options:
-      # header_organisation_url: https://quantecon.org
-      # header_organisation: QuantEcon
+      header_organisation_url: https://quantecon.org
+      header_organisation: QuantEcon
       repository_url: https://github.com/QuantEcon/lecture-python-intro
-      # nb_repository_url: https://github.com/QuantEcon/lecture-python-intro.notebooks
-      # 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
-      # description: This website presents a set of lectures on python programming for economics, designed and written by Thomas J. Sargent and John Stachurski.
-      # keywords: Python, QuantEcon, Quantitative Economics, Economics, Sloan, Alfred P. Sloan Foundation, Tom J. Sargent, John Stachurski
+      nb_repository_url: https://github.com/QuantEcon/lecture-python-intro.notebooks
+      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
+      description: This website presents introductory lectures on computational economics, designed and written by Thomas J. Sargent and John Stachurski.
+      keywords: Python, QuantEcon, Quantitative Economics, Economics, Sloan, Alfred P. Sloan Foundation, Tom J. Sargent, John Stachurski
       # analytics:
       #   google_analytics_id: UA-54984338-9
       launch_buttons:

lectures/cobweb.md

@@ -106,12 +106,12 @@ where $a, b$ are nonnegative constants and $p_t$ is the spot (i.e, current marke
 
 ($D(p_t)$ is the quantity demanded in some fixed unit, such as thousands of tons.)
 
-Because the crop of soy beans for time $t$ is planted at $t-1$, supply of soy beans at time $t$ depends on *expected* prices at time $t$, which we denote $p^e_t$.
+Because the crop of soy beans for time $t$ is planted at $t-1$, supply of soy beans at time $t$ depends on *expected* prices at time $t$, which we denote $p^e_{t-1}$.
 
 We suppose that supply is nonlinear in expected prices, and takes the form
 
 $$
-    S(p^e_t) = \tanh(\lambda(p^e_t - c)) + d
+    S(p^e_{t-1}) = \tanh(\lambda(p^e_{t-1} - c)) + d
 $$
 
 where $\lambda$ is a positive constant and $c, d \geq 0$.
@@ -160,13 +160,13 @@ plt.show()
 Market equilibrium requires that supply equals demand, or
 
 $$
-    a - b p_t = S(p^e_t)
+    a - b p_t = S(p^e_{t-1})
 $$
 
 Rewriting in terms of $p_t$ gives
 
 $$
-    p_t = - \frac{1}{b} [S(p^e_t) - a]
+    p_t = - \frac{1}{b} [S(p^e_{t-1}) - a]
 $$
 
 Finally, to complete the model, we need to describe how price expectations are formed.
@@ -177,7 +177,7 @@ In particular, we suppose that
 
 ```{math}
 :label: p_et
-    p^e_t = f(p_{t-1}, p_{t-2})
+    p^e_{t-1} = f(p_{t-1}, p_{t-2})
 ```
 
 where $f$ is some function.
@@ -204,7 +204,7 @@ Let's start with naive expectations, which refers to the case where producers ex
 
 In other words,
 
-$$ p_t^e = p_{t-1} $$
+$$ p_{t-1}^e = p_{t-1} $$
 
 Using {eq}`price_t`, we then have
 
@@ -276,7 +276,7 @@ def plot45(model, pmin, pmax, p0, num_arrows=5):
             alpha=0.6, head_length=hl)
 
     ax.plot(pgrid, g(model, pgrid), 'b-',
-            lw=2, alpha=0.6, label='p')
+            lw=2, alpha=0.6, label='g')
     ax.plot(pgrid, pgrid, lw=1, alpha=0.7, label='45')
 
     x = p0
@@ -408,15 +408,15 @@ That is,
 
 ```{math}
 :label: pe_adaptive
-p_t^e = \alpha p_{t-1} + (1-\alpha) p^e_{t-1}
+p_{t-1}^e = \alpha p_{t-1} + (1-\alpha) p^e_{t-2}
 \qquad (0 \leq \alpha \leq 1)
 ```
 
 Another way to write this is
 
 ```{math}
 :label: pe_adaptive_2
-p_t^e = p^e_{t-1} + \alpha (p_{t-1} - p_{t-1}^e)
+p_{t-1}^e = p^e_{t-2} + \alpha (p_{t-1} - p_{t-2}^e)
 ```
 
 This equation helps to show that expectations shift
@@ -427,7 +427,7 @@ This equation helps to show that expectations shift
 Using {eq}`pe_adaptive`, we obtain the dynamics
 
 $$
-    p_t = - \frac{1}{b} [ S(\alpha p_{t-1} + (1-\alpha) p^e_{t-1}) - a]
+    p_t = - \frac{1}{b} [ S(\alpha p_{t-1} + (1-\alpha) p^e_{t-2}) - a]
 $$
 
 
@@ -547,7 +547,7 @@ That is,
 
 ```{math}
 :label: pe_blae
-p_t^e = \alpha p_{t-1} + (1-\alpha) p_{t-2}
+p_{t-1}^e = \alpha p_{t-1} + (1-\alpha) p_{t-2}
 ```
 
 
@@ -610,3 +610,4 @@ ts_plot_price_blae(m,
 ```{code-cell} ipython3
 
 ```
+

lectures/eigen_II.md

@@ -20,6 +20,22 @@ kernelspec:
 :depth: 2
 ```
 
+In addition to what's in Anaconda, this lecture will need the following libraries:
+
+```{code-cell} ipython
+---
+tags: [hide-output]
+---
+!pip install graphviz
+```
+
+```{admonition} graphviz
+:class: warning
+If you are running this lecture locally it requires [graphviz](https://www.graphviz.org)
+to be installed on your computer. Installation instructions for graphviz can be found
+[here](https://www.graphviz.org/download/) 
+```
+
 In this lecture we will begin with the basic properties of nonnegative matrices.
 
 Then we will explore the Perron-Frobenius Theorem and the Neumann Series Lemma, and connect them to applications in Markov chains and networks. 

lectures/lake_model.md

@@ -13,7 +13,22 @@ kernelspec:
 
 # A Lake Model of Employment
 
-\
+In addition to what's in Anaconda, this lecture will need the following libraries:
+
+```{code-cell} ipython
+---
+tags: [hide-output]
+---
+!pip install graphviz
+```
+
+```{admonition} graphviz
+:class: warning
+If you are running this lecture locally it requires [graphviz](https://www.graphviz.org)
+to be installed on your computer. Installation instructions for graphviz can be found
+[here](https://www.graphviz.org/download/) 
+```
+
 This lecture studies a model of employment and unemployment flows in a large
 population.
 

lectures/markov_chains_I.md

@@ -24,6 +24,13 @@ In addition to what's in Anaconda, this lecture will need the following librarie
 !pip install graphviz
 ```
 
+```{admonition} graphviz
+:class: warning
+If you are running this lecture locally it requires [graphviz](https://www.graphviz.org)
+to be installed on your computer. Installation instructions for graphviz can be found
+[here](https://www.graphviz.org/download/) 
+```
+
 +++ {"user_expressions": []}
 
 ## Overview