From 8853b708d44c3893df94b2a444a45cd4cafc13a4 Mon Sep 17 00:00:00 2001 From: Longye Tian Date: Mon, 1 Jul 2024 10:15:33 +1000 Subject: [PATCH 01/12] [geom_series] remark_admonition Dear John, This pull request is for #442. I use the geom_series.md lecture as an example to test the current admonition style. Best, Longye --- lectures/geom_series.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lectures/geom_series.md b/lectures/geom_series.md index be698d01..0ea97279 100644 --- a/lectures/geom_series.md +++ b/lectures/geom_series.md @@ -105,9 +105,12 @@ $$ 1 + c + c^2 + c^3 + \cdots + c^T = \frac{1 - c^{T+1}}{1-c} $$ -**Remark:** The above formula works for any value of the scalar +```{prf:remark} +:label: geom_formula +The above formula works for any value of the scalar $c$. We don't have to restrict $c$ to be in the set $(-1,1)$. +``` We now move on to describe some famous economic applications of geometric series. From 294ccfe413cbe782ea33b20f21a792590c067a8d Mon Sep 17 00:00:00 2001 From: mmcky Date: Tue, 16 Jul 2024 08:56:36 +1000 Subject: [PATCH 02/12] TST: install main branch version of sphinx-proof --- environment.yml | 2 +- lectures/_config.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 52036b80..2f031d7e 100644 --- a/environment.yml +++ b/environment.yml @@ -13,7 +13,7 @@ dependencies: - sphinx-tojupyter==0.3.0 - sphinxext-rediraffe==0.2.7 - sphinx-exercise==0.4.1 - - sphinx-proof==0.1.3 + - git+https://github.com/executablebooks/sphinx-proof@main - ghp-import==1.1.0 - sphinxcontrib-youtube==1.1.0 - sphinx-togglebutton==0.3.1 diff --git a/lectures/_config.yml b/lectures/_config.yml index 1d5a36e6..0b0bcf3c 100644 --- a/lectures/_config.yml +++ b/lectures/_config.yml @@ -45,6 +45,7 @@ sphinx: width: 80% nb_code_prompt_show: "Show {type}" suppress_warnings: [mystnb.unknown_mime_type, myst.domains] + proof_minimal_theme: true # ------------- html_js_files: - https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js From 2054d7c299024fcd8dad579fb41575d13e1994bd Mon Sep 17 00:00:00 2001 From: mmcky Date: Mon, 22 Jul 2024 10:05:45 +1000 Subject: [PATCH 03/12] test with new css definition --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 2f031d7e..2a7dc93c 100644 --- a/environment.yml +++ b/environment.yml @@ -13,7 +13,7 @@ dependencies: - sphinx-tojupyter==0.3.0 - sphinxext-rediraffe==0.2.7 - sphinx-exercise==0.4.1 - - git+https://github.com/executablebooks/sphinx-proof@main + - git+https://github.com/executablebooks/sphinx-proof@reconfig-stylecss - ghp-import==1.1.0 - sphinxcontrib-youtube==1.1.0 - sphinx-togglebutton==0.3.1 From de7a451a00bec245532e7abe6dfbfc60237a849e Mon Sep 17 00:00:00 2001 From: mmcky Date: Tue, 20 Aug 2024 10:14:42 +1000 Subject: [PATCH 04/12] test the new css styling for remark --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 2a7dc93c..05c419ad 100644 --- a/environment.yml +++ b/environment.yml @@ -13,7 +13,7 @@ dependencies: - sphinx-tojupyter==0.3.0 - sphinxext-rediraffe==0.2.7 - sphinx-exercise==0.4.1 - - git+https://github.com/executablebooks/sphinx-proof@reconfig-stylecss + - git+https://github.com/executablebooks/sphinx-proof@admonition-style-update - ghp-import==1.1.0 - sphinxcontrib-youtube==1.1.0 - sphinx-togglebutton==0.3.1 From 5b0d0d3c32f3097c269bbbd955b521a7ac698750 Mon Sep 17 00:00:00 2001 From: mmcky Date: Tue, 20 Aug 2024 10:42:16 +1000 Subject: [PATCH 05/12] test updated quantecon-book-theme --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 05c419ad..a477120c 100644 --- a/environment.yml +++ b/environment.yml @@ -9,7 +9,7 @@ dependencies: - pip: - jupyter-book==0.15.1 - docutils==0.17.1 - - quantecon-book-theme==0.7.1 + - git+https://github.com/QuantEcon/quantecon-book-theme@admonition-style-update - sphinx-tojupyter==0.3.0 - sphinxext-rediraffe==0.2.7 - sphinx-exercise==0.4.1 From 6acd7ac5169bb8cb8cec180ccb5b7e18493baa6e Mon Sep 17 00:00:00 2001 From: mmcky Date: Tue, 10 Sep 2024 13:43:39 +1000 Subject: [PATCH 06/12] upgrade quantecon-book-theme==0.7.2 --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index a477120c..bcafbec2 100644 --- a/environment.yml +++ b/environment.yml @@ -9,7 +9,7 @@ dependencies: - pip: - jupyter-book==0.15.1 - docutils==0.17.1 - - git+https://github.com/QuantEcon/quantecon-book-theme@admonition-style-update + - quantecon-book-theme==0.7.2 - sphinx-tojupyter==0.3.0 - sphinxext-rediraffe==0.2.7 - sphinx-exercise==0.4.1 From c2f33f6d365fd3a4222e26ccfa0288eb3e591d8a Mon Sep 17 00:00:00 2001 From: mmcky Date: Tue, 10 Sep 2024 13:49:59 +1000 Subject: [PATCH 07/12] update branch until released for sphinx-proof --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index bcafbec2..ac0b278c 100644 --- a/environment.yml +++ b/environment.yml @@ -13,7 +13,7 @@ dependencies: - sphinx-tojupyter==0.3.0 - sphinxext-rediraffe==0.2.7 - sphinx-exercise==0.4.1 - - git+https://github.com/executablebooks/sphinx-proof@admonition-style-update + - git+https://github.com/executablebooks/sphinx-proof@main - ghp-import==1.1.0 - sphinxcontrib-youtube==1.1.0 - sphinx-togglebutton==0.3.1 From 8b60a5a7ad97f9a4121a06d11ea7ed108dd83a0d Mon Sep 17 00:00:00 2001 From: mmcky Date: Wed, 11 Sep 2024 10:05:39 +1000 Subject: [PATCH 08/12] enable sphinx-proof==0.2.0 --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index ac0b278c..74ae0173 100644 --- a/environment.yml +++ b/environment.yml @@ -13,7 +13,7 @@ dependencies: - sphinx-tojupyter==0.3.0 - sphinxext-rediraffe==0.2.7 - sphinx-exercise==0.4.1 - - git+https://github.com/executablebooks/sphinx-proof@main + - sphinx-proof==0.2.0 - ghp-import==1.1.0 - sphinxcontrib-youtube==1.1.0 - sphinx-togglebutton==0.3.1 From aa6ba4a4b6f52f85ba1e344a460d7f1b13b6f534 Mon Sep 17 00:00:00 2001 From: mmcky Date: Wed, 11 Sep 2024 10:32:34 +1000 Subject: [PATCH 09/12] update software for collab testing --- .github/workflows/collab.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/collab.yml b/.github/workflows/collab.yml index f2ede9bf..e6e3a9a3 100644 --- a/.github/workflows/collab.yml +++ b/.github/workflows/collab.yml @@ -30,7 +30,7 @@ jobs: - 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.1 sphinx-tojupyter==0.3.0 sphinxext-rediraffe==0.2.7 sphinx-exercise==0.4.1 sphinxcontrib-youtube==1.1.0 sphinx-togglebutton==0.3.1 arviz==0.13.0 sphinx_proof==0.1.3 + 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-exercise==0.4.1 sphinxcontrib-youtube==1.1.0 sphinx-togglebutton==0.3.1 arviz==0.13.0 sphinx_proof==0.2.0 # Build of HTML (Execution Testing) - name: Build HTML shell: bash -l {0} From 9b2c9b02a702011a9b9285aa93ceaed96d291db4 Mon Sep 17 00:00:00 2001 From: Longye Tian Date: Fri, 13 Sep 2024 17:58:25 +1000 Subject: [PATCH 10/12] remark_money_inflation Add remark admonition for money_inflation.md --- lectures/money_inflation.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lectures/money_inflation.md b/lectures/money_inflation.md index 216a9a63..d7e37ecd 100644 --- a/lectures/money_inflation.md +++ b/lectures/money_inflation.md @@ -385,13 +385,21 @@ m_t & = b_{t-1} p_t \end{aligned} $$ (eq:method1) -**Remark 1:** method 1 uses an indirect approach to computing an equilibrium by first computing an equilibrium $\{R_t, b_t\}_{t=0}^\infty$ sequence and then using it to back out an equilibrium $\{p_t, m_t\}_{t=0}^\infty$ sequence. - +```{prf:remark} +:label: method_1 +Method 1 uses an indirect approach to computing an equilibrium by first computing an equilibrium $\{R_t, b_t\}_{t=0}^\infty$ sequence and then using it to back out an equilibrium $\{p_t, m_t\}_{t=0}^\infty$ sequence. +``` -**Remark 2:** notice that method 1 starts by picking an **initial condition** $R_0$ from a set $[\frac{\gamma_2}{\gamma_1}, R_u]$. Equilibrium $\{p_t, m_t\}_{t=0}^\infty$ sequences are not unique. There is actually a continuum of equilibria indexed by a choice of $R_0$ from the set $[\frac{\gamma_2}{\gamma_1}, R_u]$. +```{prf:remark} +:label: initial_condition +Notice that method 1 starts by picking an **initial condition** $R_0$ from a set $[\frac{\gamma_2}{\gamma_1}, R_u]$. Equilibrium $\{p_t, m_t\}_{t=0}^\infty$ sequences are not unique. There is actually a continuum of equilibria indexed by a choice of $R_0$ from the set $[\frac{\gamma_2}{\gamma_1}, R_u]$. +``` -**Remark 3:** associated with each selection of $R_0$ there is a unique $p_0$ described by +```{prf:remark} +:label: unique_selection +Associated with each selection of $R_0$ there is a unique $p_0$ described by equation {eq}`eq:p0fromR0`. +``` ### Method 2 From daba2cecce6769bc4283ed4a82bbed20a8ca115a Mon Sep 17 00:00:00 2001 From: Longye Tian Date: Fri, 13 Sep 2024 17:59:35 +1000 Subject: [PATCH 11/12] remark_unpleasent Add remark admonition to unpleasent.md --- lectures/unpleasant.md | 1 + 1 file changed, 1 insertion(+) diff --git a/lectures/unpleasant.md b/lectures/unpleasant.md index 676edfa1..5eb80e31 100644 --- a/lectures/unpleasant.md +++ b/lectures/unpleasant.md @@ -241,6 +241,7 @@ p_T = \frac{m_0}{\gamma_1 - \overline g - \gamma_2 R_u^{-1}} = \gamma_1^{-1} $$ (eq:pTformula) ```{prf:remark} +:label: equivalence We can verify the equivalence of the two formulas on the right sides of {eq}`eq:pTformula` by recalling that $R_u$ is a root of the quadratic equation {eq}`eq:up_steadyquadratic` that determines steady state rates of return on currency. ``` From c281cdb45002021a369cc9848811e98e9156ccda Mon Sep 17 00:00:00 2001 From: Longye Tian Date: Fri, 13 Sep 2024 18:01:09 +1000 Subject: [PATCH 12/12] remark_money_inflation_nonlinear Add remark admonition for money_inflation_nonlinear.md --- lectures/money_inflation_nonlinear.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lectures/money_inflation_nonlinear.md b/lectures/money_inflation_nonlinear.md index f716916f..07922373 100644 --- a/lectures/money_inflation_nonlinear.md +++ b/lectures/money_inflation_nonlinear.md @@ -68,7 +68,10 @@ $$ (eq:msupply) where $g$ is the part of government expenditures financed by printing money. -**Remark:** Please notice that while equation {eq}`eq:mdemand` is linear in logs of the money supply and price level, equation {eq}`eq:msupply` is linear in levels. This will require adapting the equilibrium computation methods that we deployed in {doc}`money_inflation`. +```{prf:remark} +:label: linear_log +Please notice that while equation {eq}`eq:mdemand` is linear in logs of the money supply and price level, equation {eq}`eq:msupply` is linear in levels. This will require adapting the equilibrium computation methods that we deployed in {doc}`money_inflation`. +```