Skip to content

Commit a16fd6c

Browse files
mmckymmcky
committed
Merge branch 'master' into sphinx-external-toc
2 parents b5e629c + 240d702 commit a16fd6c

File tree

7 files changed

+133
-24
lines changed

7 files changed

+133
-24
lines changed

‎.github/workflows/ci.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,17 @@ jobs:
1515
python-version: 3.8
1616
environment-file: environment.yml
1717
activate-environment: lecture-python-programming
18+
- name: Install latex dependencies
19+
run: |
20+
sudo apt-get -qq update
21+
sudo apt-get install -y \
22+
texlive-latex-recommended \
23+
texlive-latex-extra \
24+
texlive-fonts-recommended \
25+
texlive-fonts-extra \
26+
texlive-xetex \
27+
latexmk \
28+
xindy
1829
- name: Display Conda Environment Versions
1930
shell: bash -l {0}
2031
run: conda list
@@ -28,16 +39,24 @@ jobs:
2839
branch: master
2940
name: build-cache
3041
path: _build
31-
- name: Build HTML
32-
shell: bash -l {0}
33-
run: |
34-
jb build lectures --path-output ./
42+
# Build Assets (Download Notebooks and PDF via LaTeX)
3543
- name: Build Download Notebooks (sphinx-tojupyter)
3644
shell: bash -l {0}
3745
run: |
3846
jb build lectures --path-output ./ --builder=custom --custom-builder=jupyter
3947
mkdir -p _build/html/_notebooks
4048
cp -u _build/jupyter/*.ipynb _build/html/_notebooks
49+
- name: Build PDF from LaTeX
50+
shell: bash -l {0}
51+
run: |
52+
jb build lectures --builder pdflatex --path-output ./ -n --keep-going
53+
mkdir _build/html/_pdf
54+
cp -u _build/latex/*.pdf _build/html/_pdf
55+
# Final Build of HTML
56+
- name: Build HTML
57+
shell: bash -l {0}
58+
run: |
59+
jb build lectures --path-output ./
4160
- name: Preview Deploy to Netlify
4261
uses: nwtgck/[email protected]
4362
with:

‎.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: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,24 @@ jobs:
1919
python-version: 3.8
2020
environment-file: environment.yml
2121
activate-environment: quantecon
22+
- name: Install latex dependencies
23+
run: |
24+
sudo apt-get -qq update
25+
sudo apt-get install -y \
26+
texlive-latex-recommended \
27+
texlive-latex-extra \
28+
texlive-fonts-recommended \
29+
texlive-fonts-extra \
30+
texlive-xetex \
31+
latexmk \
32+
xindy
2233
- name: Display Conda Environment Versions
2334
shell: bash -l {0}
2435
run: conda list
2536
- name: Display Pip Versions
2637
shell: bash -l {0}
2738
run: pip list
28-
- name: Build HTML
29-
shell: bash -l {0}
30-
run: |
31-
jb build lectures --path-output ./
39+
# Build Assets (Download Notebooks, PDF via LaTeX)
3240
- name: Build Download Notebooks (sphinx-tojupyter)
3341
shell: bash -l {0}
3442
run: |
@@ -41,8 +49,22 @@ jobs:
4149
- name: Copy Download Notebooks for GH-PAGES
4250
shell: bash -l {0}
4351
run: |
44-
mkdir _build/html/_notebooks
45-
cp _build/jupyter/*.ipynb _build/html/_notebooks
52+
mkdir -p _build/html/_notebooks
53+
cp -u _build/jupyter/*.ipynb _build/html/_notebooks
54+
- name: Build PDF from LaTeX
55+
shell: bash -l {0}
56+
run: |
57+
jb build lectures --builder pdflatex --path-output ./ -n --keep-going
58+
- name: Copy LaTeX PDF for GH-PAGES
59+
shell: bash -l {0}
60+
run: |
61+
mkdir -p _build/html/_pdf
62+
cp -u _build/latex/*.pdf _build/html/_pdf
63+
# Final Build of HTML (with assets)
64+
- name: Build HTML
65+
shell: bash -l {0}
66+
run: |
67+
jb build lectures --path-output ./
4668
- name: Deploy website to gh-pages
4769
uses: peaceiris/actions-gh-pages@v3
4870
with:

‎environment.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ dependencies:
66
- anaconda=2020.11
77
- pip
88
- pip:
9-
- git+https://github.com/executablebooks/jupyter-book@sphinx-external-toc
10-
- sphinx-multitoc-numbering
11-
- quantecon-book-theme
12-
- sphinx-tojupyter
13-
- sphinxext-rediraffe
14-
- sphinx-exercise
15-
- jupytext
16-
- ghp-import
17-
- jupinx
18-
# Temporary
9+
- jupyter-book==0.11.1
10+
- sphinx-multitoc-numbering==0.1.3
11+
- quantecon-book-theme==0.2.3
12+
- sphinx-tojupyter==0.1.1
13+
- sphinxext-rediraffe==0.2.7
14+
- sphinx-exercise==0.1.1
15+
- jupytext==1.11.2
16+
- ghp-import==1.1.0
17+
- jupinx==0.2.3
18+
# Temporary Fixes
1919
- tornado>=6.1
2020

‎lectures/_config.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ execute:
1111
html:
1212
baseurl: https://python.quantecon.org/
1313

14+
latex:
15+
latex_documents:
16+
targetname: quantecon-python-programming.tex
17+
1418
sphinx:
1519
extra_extensions: [sphinx_multitoc_numbering, sphinxext.rediraffe, sphinx_tojupyter]
1620
config:
@@ -31,9 +35,8 @@ sphinx:
3135
launch_buttons:
3236
notebook_interface : classic # The interface interactive links will activate ["classic", "jupyterlab"]
3337
binderhub_url : https://mybinder.org # The URL of the BinderHub (e.g., https://mybinder.org)
34-
jupyterhub_url : https://datahub.berkeley.edu # The URL of the JupyterHub (e.g., https://datahub.berkeley.edu)
3538
thebe : false # Add a thebe button to pages (requires the repository to run on Binder)
36-
colab_url : https://colab.research.google.com # The URL of Google Colab (https://colab.research.google.com)
39+
mathjax_path: https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-svg.js
3740
rediraffe_redirects:
3841
index_toc.md: intro.md
3942
tojupyter_static_file_path: ["source/_static", "_static"]

‎lectures/pandas.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ Following the work you did in {ref}`Exercise 1 <pd_ex1>`, you can query the data
549549
```{code-cell} python3
550550
indices_data = read_data(
551551
indices_list,
552-
start=dt.datetime(1928, 1, 2),
552+
start=dt.datetime(1971, 1, 1), #Common Start Date
553553
end=dt.datetime(2020, 12, 31)
554554
)
555555
```

‎lectures/python_by_example.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ Set $T=200$ and $\alpha = 0.9$.
475475

476476
### Exercise 2
477477

478-
Starting with your solution to exercise 2, plot three simulated time series,
478+
Starting with your solution to exercise 1, plot three simulated time series,
479479
one for each of the cases $\alpha=0$, $\alpha=0.8$ and $\alpha=0.98$.
480480

481481
Use a `for` loop to step through the $\alpha$ values.

0 commit comments

Comments
 (0)