Skip to content

Commit 5f3dd9b

Browse files
committed
Merge branch 'main' into con_smooth_update
2 parents 39441a5 + d483579 commit 5f3dd9b

27 files changed

+77
-85
lines changed

.github/workflows/cache.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,5 @@ jobs:
4848
uses: actions/upload-artifact@v4
4949
with:
5050
name: build-cache
51-
path: _build
51+
path: _build
52+
include-hidden-files: true

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
shell: bash -l {0}
3939
run: pip list
4040
- name: Download "build" folder (cache)
41-
uses: dawidd6/action-download-artifact@v6
41+
uses: dawidd6/action-download-artifact@v8
4242
with:
4343
workflow: cache.yml
4444
branch: main

.github/workflows/collab.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [pull_request]
33

44
jobs:
55
test:
6-
runs-on: ubuntu-latest-m
6+
runs-on: quantecon-large
77
container:
88
image: us-docker.pkg.dev/colab-images/public/runtime:latest
99
steps:
@@ -20,7 +20,7 @@ jobs:
2020
shell: bash -l {0}
2121
run: pip list
2222
- name: Download "build" folder (cache)
23-
uses: dawidd6/action-download-artifact@v6
23+
uses: dawidd6/action-download-artifact@v8
2424
with:
2525
workflow: cache.yml
2626
branch: main

.github/workflows/linkcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
environment-file: environment.yml
2828
activate-environment: quantecon
2929
- name: Download "build" folder (cache)
30-
uses: dawidd6/action-download-artifact@v6
30+
uses: dawidd6/action-download-artifact@v8
3131
with:
3232
workflow: cache.yml
3333
branch: main

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
shell: bash -l {0}
4040
run: pip list
4141
- name: Download "build" folder (cache)
42-
uses: dawidd6/action-download-artifact@v6
42+
uses: dawidd6/action-download-artifact@v8
4343
with:
4444
workflow: cache.yml
4545
branch: main

environment.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,16 @@ channels:
44
- conda-forge
55
dependencies:
66
- python=3.12
7-
- anaconda=2024.06
7+
- anaconda=2024.10
88
- pip
99
- pip:
10-
- jupyter-book==0.15.1
11-
- docutils==0.17.1
12-
- quantecon-book-theme==0.7.2
10+
- jupyter-book==1.0.3
11+
- quantecon-book-theme==0.7.6
1312
- sphinx-tojupyter==0.3.0
1413
- sphinxext-rediraffe==0.2.7
15-
- sphinx-exercise==0.4.1
14+
- sphinx-exercise==1.0.1
15+
- ghp-import==2.1.0
16+
- sphinxcontrib-youtube==1.3.0 #Version 1.3.0 is required as quantecon-book-theme is only compatible with sphinx<=5
1617
- sphinx-proof==0.2.0
17-
- ghp-import==1.1.0
18-
- sphinxcontrib-youtube==1.1.0
19-
- sphinx-togglebutton==0.3.1
20-
- sphinx_reredirects==0.1.3
21-
# Sandpit Requirements
22-
# - PuLP
23-
# - cvxpy
24-
# - cvxopt
25-
# - cylp
26-
# - array-to-latex
27-
# - prettytable
18+
- sphinx-togglebutton==0.3.2
19+
- sphinx-reredirects==0.1.4 #Version 0.1.5 requires sphinx>=7.1

lectures/ar1_processes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ for t in range(sim_length):
180180
mu = a * mu + b
181181
v = a**2 * v + c**2
182182
ax.plot(grid, norm.pdf(grid, loc=mu, scale=np.sqrt(v)),
183-
label=f"$\psi_{t}$",
183+
label=fr"$\psi_{t}$",
184184
alpha=0.7)
185185
186186
ax.legend(bbox_to_anchor=[1.05,1],loc=2,borderaxespad=1)
@@ -267,7 +267,7 @@ plot_density_seq(ax, mu_0=4.0)
267267
mu_star = b / (1 - a)
268268
std_star = np.sqrt(c**2 / (1 - a**2)) # square root of v_star
269269
psi_star = norm.pdf(grid, loc=mu_star, scale=std_star)
270-
ax.plot(grid, psi_star, 'k-', lw=2, label="$\psi^*$")
270+
ax.plot(grid, psi_star, 'k-', lw=2, label=r"$\psi^*$")
271271
ax.legend()
272272
273273
plt.show()

lectures/cobweb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ def plot45(model, pmin, pmax, p0, num_arrows=5):
271271
272272
ax.plot(pgrid, g(model, pgrid), 'b-',
273273
lw=2, alpha=0.6, label='g')
274-
ax.plot(pgrid, pgrid, lw=1, alpha=0.7, label='$45\degree$')
274+
ax.plot(pgrid, pgrid, lw=1, alpha=0.7, label=r'$45\degree$')
275275
276276
x = p0
277277
xticks = [pmin]

lectures/commod_price.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The figure below shows the price of cotton in USD since the start of 2016.
6060
```{code-cell} ipython3
6161
:tags: [hide-input, hide-output]
6262
63-
s = yf.download('CT=F', '2016-1-1', '2023-4-1')['Adj Close']
63+
s = yf.download('CT=F', '2016-1-1', '2023-4-1')['Close']
6464
```
6565

6666
```{code-cell} ipython3

lectures/cons_smooth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Milton Friedman had used this idea in his PhD thesis at Columbia University,
3434
eventually published as {cite}`kuznets1939incomes` and {cite}`friedman1954incomes`.
3535
```
3636

37-
It will take a while for a "present value" or asset price explicilty to appear in this lecture, but when it does it will be a key actor.
37+
It will take a while for a "present value" or asset price explicitly to appear in this lecture, but when it does it will be a key actor.
3838

3939

4040
## Analysis

0 commit comments

Comments
 (0)