Skip to content

Commit 9c29cae

Browse files
mmckymmcky
committed
Merge branch 'main' into update-intro
2 parents d8c18cd + 1cbc8fc commit 9c29cae

File tree

7 files changed

+189
-94
lines changed

7 files changed

+189
-94
lines changed

‎.github/workflows/cache.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Build Cache [using jupyter-book]
2+
on:
3+
push:
4+
branches:
5+
- main
6+
jobs:
7+
tests:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@v2
12+
- name: Setup Anaconda
13+
uses: conda-incubator/setup-miniconda@v2
14+
with:
15+
auto-update-conda: true
16+
auto-activate-base: true
17+
miniconda-version: 'latest'
18+
python-version: 3.8
19+
environment-file: environment.yml
20+
activate-environment: quantecon
21+
- name: Build HTML
22+
shell: bash -l {0}
23+
run: |
24+
jb build lectures --path-output ./ -W --keep-going
25+
- name: Upload "_build" folder (cache)
26+
uses: actions/upload-artifact@v2
27+
with:
28+
name: build-cache
29+
path: _build

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Download "build" folder (cache)
3636
uses: dawidd6/action-download-artifact@v2
3737
with:
38-
workflow: publish.yml
38+
workflow: cache.yml
3939
branch: main
4040
name: build-cache
4141
path: _build
@@ -71,4 +71,4 @@ jobs:
7171
deploy-message: "Preview Deploy from GitHub Actions"
7272
env:
7373
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
74-
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
74+
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}

‎.github/workflows/execution.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Run Execution Tests [Latest Anaconda]
2+
on:
3+
schedule:
4+
# UTC 22:00 is early morning in Australia
5+
- cron: '0 22 * * *'
6+
jobs:
7+
execution-tests-linux-osx:
8+
name: Execution Tests (${{ matrix.python-version }}, ${{ matrix.os }})
9+
runs-on: ${{ matrix.os }}
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
os: ["ubuntu-latest", "macos-latest"]
14+
python-version: ["3.8"]
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v2
18+
- uses: conda-incubator/setup-miniconda@v2
19+
with:
20+
auto-update-conda: true
21+
python-version: ${{ matrix.python-version }}
22+
- name: Install Anaconda + Dependencies
23+
shell: bash -l {0}
24+
run: |
25+
conda install anaconda
26+
pip install jupyter-book sphinx-multitoc-numbering quantecon-book-theme sphinxext-rediraffe sphinx_tojupyter
27+
- name: Build Lectures (+ Execution Checks)
28+
shell: bash -l {0}
29+
run: jb build lectures --path-output=./ -W --keep-going
30+
- name: Upload Execution Reports
31+
uses: actions/upload-artifact@v2
32+
if: failure()
33+
with:
34+
name: execution-reports
35+
path: _build/html/reports
36+
# execution-tests-win:
37+
# name: Execution Tests (${{ matrix.python-version }}, ${{ matrix.os }})
38+
# runs-on: ${{ matrix.os }}
39+
# strategy:
40+
# fail-fast: false
41+
# matrix:
42+
# os: ["windows-latest"]
43+
# python-version: ["3.8"]
44+
# steps:
45+
# - name: Checkout
46+
# uses: actions/checkout@v2
47+
# - uses: conda-incubator/setup-miniconda@v2
48+
# with:
49+
# auto-update-conda: true
50+
# python-version: ${{ matrix.python-version }}
51+
# - name: Install Anaconda + Dependencies
52+
# shell: powershell
53+
# run: |
54+
# conda install anaconda
55+
# pip install jupyter-book
56+
# pip install jupyter-book sphinx-multitoc-numbering quantecon-book-theme sphinxext-rediraffe sphinx_tojupyter
57+
# - name: Build Lectures (+ Execution Checks)
58+
# shell: powershell
59+
# run: jb build lectures --path-output=./ -W --keep-going
60+
# - name: Upload Execution Reports
61+
# uses: actions/upload-artifact@v2
62+
# if: failure()
63+
# with:
64+
# name: execution-reports
65+
# path: _build/html/reports

‎.github/workflows/publish.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ jobs:
3636
- name: Display Pip Versions
3737
shell: bash -l {0}
3838
run: pip list
39+
# - name: Download "build" folder (cache)
40+
# uses: dawidd6/action-download-artifact@v2
41+
# with:
42+
# workflow: cache.yml
43+
# branch: main
44+
# name: build-cache
45+
# path: _build
3946
# Build Assets (Download Notebooks and PDF via LaTeX)
4047
- name: Build PDF from LaTeX
4148
shell: bash -l {0}
@@ -71,11 +78,6 @@ jobs:
7178
github_token: ${{ secrets.GITHUB_TOKEN }}
7279
publish_dir: _build/html/
7380
cname: python.quantecon.org
74-
- name: Upload "_build" folder (cache)
75-
uses: actions/upload-artifact@v2
76-
with:
77-
name: build-cache
78-
path: _build
7981
- name: Prepare lecture-python.notebooks sync
8082
shell: bash -l {0}
8183
run: |

‎environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ dependencies:
66
- anaconda=2020.11
77
- pip
88
- pip:
9-
- jupyter-book==0.10.2
9+
- jupyter-book==0.11.1
1010
- sphinx-multitoc-numbering==0.1.3
11-
- quantecon-book-theme==0.2.1
11+
- quantecon-book-theme==0.2.3
1212
- sphinx-tojupyter==0.1.1
1313
- sphinxext-rediraffe==0.2.7
1414
- sphinx-exercise==0.1.1

‎lectures/_toc.yml

Lines changed: 83 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,94 @@
1-
- file: intro
1+
format: jb-book
2+
root: intro
3+
parts:
4+
- caption: Tools and Techniques
25
numbered: true
3-
4-
- part: Tools and Techniques
56
chapters:
6-
- file: geom_series
7-
- file: multi_hyper
8-
- file: sir_model
9-
- file: linear_algebra
10-
- file: complex_and_trig
11-
- file: lln_clt
12-
- file: heavy_tails
13-
- file: multivariate_normal
14-
- file: time_series_with_matrices
15-
16-
- part: Introduction to Dynamics
7+
- file: geom_series
8+
- file: multi_hyper
9+
- file: sir_model
10+
- file: linear_algebra
11+
- file: complex_and_trig
12+
- file: lln_clt
13+
- file: heavy_tails
14+
- file: multivariate_normal
15+
- file: time_series_with_matrices
16+
- caption: Introduction to Dynamics
17+
numbered: true
1718
chapters:
18-
- file: scalar_dynam
19-
- file: ar1_processes
20-
- file: finite_markov
21-
- file: inventory_dynamics
22-
- file: linear_models
23-
- file: samuelson
24-
- file: kesten_processes
25-
- file: wealth_dynamics
26-
- file: kalman
27-
- file: short_path
28-
- file: cass_koopmans_1
29-
- file: cass_koopmans_2
30-
31-
- part: Search
19+
- file: scalar_dynam
20+
- file: ar1_processes
21+
- file: finite_markov
22+
- file: inventory_dynamics
23+
- file: linear_models
24+
- file: samuelson
25+
- file: kesten_processes
26+
- file: wealth_dynamics
27+
- file: kalman
28+
- file: short_path
29+
- file: cass_koopmans_1
30+
- file: cass_koopmans_2
31+
- caption: Search
32+
numbered: true
3233
chapters:
33-
- file: mccall_model
34-
- file: mccall_model_with_separation
35-
- file: mccall_fitted_vfi
36-
- file: mccall_correlated
37-
- file: career
38-
- file: jv
39-
40-
- part: Consumption, Savings and Growth
34+
- file: mccall_model
35+
- file: mccall_model_with_separation
36+
- file: mccall_fitted_vfi
37+
- file: mccall_correlated
38+
- file: career
39+
- file: jv
40+
- caption: Consumption, Savings and Growth
41+
numbered: true
4142
chapters:
42-
- file: cake_eating_problem
43-
- file: cake_eating_numerical
44-
- file: optgrowth
45-
- file: optgrowth_fast
46-
- file: coleman_policy_iter
47-
- file: egm_policy_iter
48-
- file: ifp
49-
- file: ifp_advanced
50-
51-
- part: Information
43+
- file: cake_eating_problem
44+
- file: cake_eating_numerical
45+
- file: optgrowth
46+
- file: optgrowth_fast
47+
- file: coleman_policy_iter
48+
- file: egm_policy_iter
49+
- file: ifp
50+
- file: ifp_advanced
51+
- caption: Information
52+
numbered: true
5253
chapters:
53-
- file: odu
54-
- file: likelihood_ratio_process
55-
- file: wald_friedman
56-
- file: exchangeable
57-
- file: likelihood_bayes
58-
- file: navy_captain
59-
60-
- part: LQ Control
54+
- file: odu
55+
- file: likelihood_ratio_process
56+
- file: wald_friedman
57+
- file: exchangeable
58+
- file: likelihood_bayes
59+
- file: navy_captain
60+
- caption: LQ Control
61+
numbered: true
6162
chapters:
62-
- file: lqcontrol
63-
- file: perm_income
64-
- file: perm_income_cons
65-
- file: lq_inventories
66-
67-
- part: Multiple Agent Models
63+
- file: lqcontrol
64+
- file: perm_income
65+
- file: perm_income_cons
66+
- file: lq_inventories
67+
- caption: Multiple Agent Models
68+
numbered: true
6869
chapters:
69-
- file: schelling
70-
- file: lake_model
71-
- file: rational_expectations
72-
- file: re_with_feedback
73-
- file: markov_perf
74-
- file: uncertainty_traps
75-
- file: aiyagari
76-
77-
- part: Asset Pricing and Finance
70+
- file: schelling
71+
- file: lake_model
72+
- file: rational_expectations
73+
- file: re_with_feedback
74+
- file: markov_perf
75+
- file: uncertainty_traps
76+
- file: aiyagari
77+
- caption: Asset Pricing and Finance
78+
numbered: true
7879
chapters:
79-
- file: markov_asset
80-
- file: ge_arrow
81-
- file: harrison_kreps
82-
83-
- part: Data and Empirics
80+
- file: markov_asset
81+
- file: ge_arrow
82+
- file: harrison_kreps
83+
- caption: Data and Empirics
84+
numbered: true
8485
chapters:
85-
- file: pandas_panel
86-
- file: ols
87-
- file: mle
88-
89-
90-
# Placeholder for other pages
91-
92-
- part: Other
86+
- file: pandas_panel
87+
- file: ols
88+
- file: mle
89+
- caption: Other
90+
numbered: true
9391
chapters:
94-
- file: troubleshooting
95-
- file: zreferences
96-
- file: status
92+
- file: troubleshooting
93+
- file: zreferences
94+
- file: status

‎lectures/navy_captain.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ In addition to what's in Anaconda, this lecture will need the following librarie
3131
tags: [hide-output]
3232
---
3333
!conda install -y quantecon
34+
!conda install -y -c conda-forge interpolation
3435
```
3536

3637
```{code-cell} ipython

0 commit comments

Comments
 (0)