Skip to content

Commit 3482d74

Browse files
mmckymmcky
authored
Merge branch 'main' into upd-jit
2 parents 1007120 + bc7a5cb commit 3482d74

File tree

16 files changed

+1774
-426
lines changed

16 files changed

+1774
-426
lines changed

‎.github/dependabot.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: github-actions
9+
directory: /
10+
commit-message:
11+
prefix: ⬆️
12+
schedule:
13+
interval: weekly

‎.github/workflows/cache.yml‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,13 @@ on:
44
branches:
55
- main
66
jobs:
7-
deploy-runner:
8-
runs-on: ubuntu-latest
9-
steps:
10-
- uses: iterative/setup-cml@v1
11-
- uses: actions/checkout@v3
12-
with:
13-
ref: ${{ github.event.pull_request.head.sha }}
14-
- name: Deploy runner on EC2
15-
env:
16-
REPO_TOKEN: ${{ secrets.QUANTECON_SERVICES_PAT }}
17-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
18-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
19-
run: |
20-
cml runner launch \
21-
--cloud=aws \
22-
--cloud-region=us-west-2 \
23-
--cloud-type=p3.2xlarge \
24-
--labels=cml-gpu \
25-
--cloud-hdd-size=40
267
cache:
27-
needs: deploy-runner
28-
runs-on: [self-hosted, cml-gpu]
8+
runs-on: quantecon-gpu-runner
299
container:
30-
image: docker://mmcky/quantecon-lecture-python:cuda-12.3.1-anaconda-2024-02-py311
10+
image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-10-py312
3111
options: --gpus all
3212
steps:
33-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
3414
with:
3515
ref: ${{ github.event.pull_request.head.sha }}
3616
- name: Check nvidia drivers
@@ -42,13 +22,14 @@ jobs:
4222
run: |
4323
jb build lectures --path-output ./ -W --keep-going
4424
- name: Upload Execution Reports
45-
uses: actions/upload-artifact@v2
25+
uses: actions/upload-artifact@v4
4626
if: failure()
4727
with:
4828
name: execution-reports
4929
path: _build/html/reports
5030
- name: Upload "_build" folder (cache)
51-
uses: actions/upload-artifact@v3
31+
uses: actions/upload-artifact@v4
5232
with:
5333
name: build-cache
54-
path: _build
34+
path: _build
35+
include-hidden-files: true

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,13 @@
11
name: Build Project [using jupyter-book]
22
on: [pull_request]
33
jobs:
4-
deploy-runner:
5-
runs-on: ubuntu-latest
6-
steps:
7-
- uses: iterative/setup-cml@v2
8-
- uses: actions/checkout@v3
9-
with:
10-
ref: ${{ github.event.pull_request.head.sha }}
11-
- name: Deploy runner on EC2
12-
env:
13-
REPO_TOKEN: ${{ secrets.QUANTECON_SERVICES_PAT }}
14-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
15-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
16-
run: |
17-
cml runner launch \
18-
--cloud=aws \
19-
--cloud-region=us-west-2 \
20-
--cloud-type=p3.2xlarge \
21-
--labels=cml-gpu \
22-
--cloud-hdd-size=40
234
preview:
24-
needs: deploy-runner
25-
runs-on: [self-hosted, cml-gpu]
5+
runs-on: quantecon-gpu-runner
266
container:
27-
image: docker://mmcky/quantecon-lecture-python:cuda-12.3.1-anaconda-2024-02-py311
7+
image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-10-py312
288
options: --gpus all
299
steps:
30-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
3111
with:
3212
ref: ${{ github.event.pull_request.head.sha }}
3313
# Check nvidia drivers
@@ -41,7 +21,7 @@ jobs:
4121
shell: bash -l {0}
4222
run: pip list
4323
- name: Download "build" folder (cache)
44-
uses: dawidd6/action-download-artifact@v2
24+
uses: dawidd6/action-download-artifact@v6
4525
with:
4626
workflow: cache.yml
4727
branch: main
@@ -55,7 +35,7 @@ jobs:
5535
mkdir -p _build/html/_notebooks
5636
cp -u _build/jupyter/*.ipynb _build/html/_notebooks
5737
- name: Upload Execution Reports (Download Notebooks)
58-
uses: actions/upload-artifact@v2
38+
uses: actions/upload-artifact@v4
5939
if: failure()
6040
with:
6141
name: execution-reports
@@ -67,7 +47,7 @@ jobs:
6747
mkdir -p _build/html/_pdf
6848
cp -u _build/latex/*.pdf _build/html/_pdf
6949
- name: Upload Execution Reports (LaTeX)
70-
uses: actions/upload-artifact@v2
50+
uses: actions/upload-artifact@v4
7151
if: failure()
7252
with:
7353
name: execution-reports
@@ -78,13 +58,13 @@ jobs:
7858
run: |
7959
jb build lectures --path-output ./ -n -W --keep-going
8060
- name: Upload Execution Reports (HTML)
81-
uses: actions/upload-artifact@v2
61+
uses: actions/upload-artifact@v4
8262
if: failure()
8363
with:
8464
name: execution-reports
8565
path: _build/html/reports
8666
- name: Preview Deploy to Netlify
87-
uses: nwtgck/actions-netlify@v1.1
67+
uses: nwtgck/actions-netlify@v3.0
8868
with:
8969
publish-dir: '_build/html/'
9070
production-branch: main

‎.github/workflows/execution.yml‎

Lines changed: 0 additions & 111 deletions
This file was deleted.

‎.github/workflows/linkcheck.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
os: ["ubuntu-latest"]
16-
python-version: ["3.11"]
16+
python-version: ["3.12"]
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v4
2020
- name: Setup Anaconda
2121
uses: conda-incubator/setup-miniconda@v2
2222
with:
2323
auto-update-conda: true
2424
auto-activate-base: true
2525
miniconda-version: 'latest'
26-
python-version: '3.11'
26+
python-version: '3.12'
2727
environment-file: environment.yml
2828
activate-environment: quantecon
2929
- name: Download "build" folder (cache)
30-
uses: dawidd6/action-download-artifact@v2
30+
uses: dawidd6/action-download-artifact@v6
3131
with:
3232
workflow: cache.yml
3333
branch: main
@@ -37,7 +37,7 @@ jobs:
3737
shell: bash -l {0}
3838
run: jb build lectures --path-output=./ --builder=custom --custom-builder=linkcheck
3939
- name: Upload Link Checker Reports
40-
uses: actions/upload-artifact@v2
40+
uses: actions/upload-artifact@v4
4141
if: failure()
4242
with:
4343
name: linkcheck-reports

‎.github/workflows/publish.yml‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,15 @@ on:
44
tags:
55
- 'publish*'
66
jobs:
7-
deploy-runner:
8-
runs-on: ubuntu-latest
9-
steps:
10-
- uses: iterative/setup-cml@v1
11-
- uses: actions/checkout@v3
12-
with:
13-
ref: ${{ github.event.pull_request.head.sha }}
14-
- name: Deploy runner on EC2
15-
env:
16-
REPO_TOKEN: ${{ secrets.QUANTECON_SERVICES_PAT }}
17-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
18-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
19-
run: |
20-
cml runner launch \
21-
--cloud=aws \
22-
--cloud-region=us-west-2 \
23-
--cloud-type=p3.2xlarge \
24-
--labels=cml-gpu \
25-
--cloud-hdd-size=40
267
publish:
278
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
28-
needs: deploy-runner
29-
runs-on: [self-hosted, cml-gpu]
9+
runs-on: quantecon-gpu-runner
3010
container:
31-
image: docker://mmcky/quantecon-lecture-python:cuda-12.3.1-anaconda-2024-02-py311
11+
image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-10-py312
3212
options: --gpus all
3313
steps:
3414
- name: Checkout
35-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
3616
- name: Install Git (required to commit notebooks)
3717
shell: bash -l {0}
3818
run: apt-get install -y git
@@ -48,7 +28,7 @@ jobs:
4828
run: pip list
4929
# Download Build Cache from cache.yml
5030
- name: Download "build" folder (cache)
51-
uses: dawidd6/action-download-artifact@v2
31+
uses: dawidd6/action-download-artifact@v6
5232
with:
5333
workflow: cache.yml
5434
branch: main
@@ -69,7 +49,7 @@ jobs:
6949
run: |
7050
jb build lectures --path-output ./ --builder=custom --custom-builder=jupyter -n -W --keep-going
7151
zip -r download-notebooks.zip _build/jupyter
72-
- uses: actions/upload-artifact@v2
52+
- uses: actions/upload-artifact@v4
7353
with:
7454
name: download-notebooks
7555
path: download-notebooks.zip
@@ -84,7 +64,7 @@ jobs:
8464
run: |
8565
jb build lectures --path-output ./ -n -W --keep-going
8666
- name: Deploy website to gh-pages
87-
uses: peaceiris/actions-gh-pages@v3
67+
uses: peaceiris/actions-gh-pages@v4
8868
with:
8969
github_token: ${{ secrets.GITHUB_TOKEN }}
9070
publish_dir: _build/html/

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
.DS_Store
22
_build/
33
lectures/_build/
4+
.ipynb_checkpoints/
5+
.virtual_documents/

‎environment.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name: quantecon
22
channels:
33
- default
44
dependencies:
5-
- python=3.11
6-
- anaconda=2024.02
5+
- python=3.12
6+
- anaconda=2024.10
77
- pip
88
- pip:
99
- jupyter-book==0.15.1
1010
- docutils==0.17.1
11-
- quantecon-book-theme==0.7.1
11+
- quantecon-book-theme==0.7.2
1212
- sphinx-reredirects==0.1.3
1313
- sphinx-tojupyter==0.3.0
1414
- sphinxext-rediraffe==0.2.7

‎lectures/_static/lecture_specific/cass_koopmans_1/fig_stable_manifold.png‎

175 KB
Loading

0 commit comments

Comments
 (0)