Merge branch 'main' into split-markov

Author: mmcky

.github/workflows/cache.yml

@@ -15,7 +15,7 @@ jobs:
           auto-update-conda: true
           auto-activate-base: true
           miniconda-version: 'latest'
-          python-version: 3.9
+          python-version: "3.10"
           environment-file: environment.yml
           activate-environment: quantecon
       # - name: Install latex dependencies

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
           auto-update-conda: true
           auto-activate-base: true
           miniconda-version: 'latest'
-          python-version: 3.9
+          python-version: "3.10"
           environment-file: environment.yml
           activate-environment: quantecon
       - name: Graphics Support
@@ -64,7 +64,7 @@ jobs:
         shell: bash -l {0}
         run: |
           rm -r _build/.doctrees
-          jb build lectures --path-output ./ -W --keep-going
+          jb build lectures --path-output ./ -nW --keep-going
       - name: Upload Execution Reports (HTML)
         uses: actions/upload-artifact@v2
         if: failure()

.github/workflows/publish.yml

@@ -16,7 +16,7 @@ jobs:
           auto-update-conda: true
           auto-activate-base: true
           miniconda-version: 'latest'
-          python-version: 3.9
+          python-version: "3.10"
           environment-file: environment.yml
           activate-environment: quantecon
       # - name: Install latex dependencies

environment.yml

@@ -2,13 +2,13 @@ name: quantecon
 channels:
   - default
 dependencies:
-  - python=3.9
-  - anaconda=2022.10
+  - python=3.10
+  - anaconda=2023.03
   - pip
   - pip:
     - jupyter-book==0.15.1
-    # - quantecon-book-theme==0.3.2
-    # - sphinx-tojupyter==0.2.1
+    - quantecon-book-theme==0.4.1
+    - sphinx-tojupyter==0.3.0
     - sphinxext-rediraffe==0.2.7
     - sphinx-exercise==0.4.1
     - sphinx-proof==0.1.3

lectures/_config.yml

@@ -36,7 +36,7 @@ sphinx:
   extra_extensions: [sphinx_multitoc_numbering, sphinxext.rediraffe, sphinx_exercise, sphinx_togglebutton, sphinx_proof] # sphinx_tojupyter
   config:
     html_favicon: _static/lectures-favicon.ico
-    html_theme: sphinx_book_theme
+    html_theme: quantecon_book_theme
     html_static_path: ['_static']
     html_theme_options:
       # header_organisation_url: https://quantecon.org

lectures/_toc.yml

@@ -8,6 +8,13 @@ parts:
   - file: long_run_growth
   - file: business_cycle
   - file: inequality
+- caption: Supply and Demand
+  numbered: true
+  chapters:
+  - file: intro_supply_demand
+  - file: supply_demand_multiple_goods
+  - file: supply_demand_heterogeneity
+  - file: input_output
 - caption: Tools & Techniques
   numbered: true
   chapters:
@@ -31,6 +38,7 @@ parts:
   - file: schelling
   - file: solow
   - file: cobweb
+  - file: lake_model
   - file: olg
 - caption: Other
   numbered: true