Skip to content

Commit ac0ef48

Browse files
authored
Merge branch 'main' into bayes_nonconj
2 parents a372eda + 500eed1 commit ac0ef48

34 files changed

+10152
-3512
lines changed

.github/workflows/_future/cache-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
auto-update-conda: true
1818
auto-activate-base: true
1919
miniconda-version: 'latest'
20-
python-version: "3.12"
20+
python-version: "3.13"
2121
environment-file: environment.yml
2222
activate-environment: quantecon
2323
- name: Build HTML

.github/workflows/_future/ci-cn.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
auto-update-conda: true
1313
auto-activate-base: true
1414
miniconda-version: 'latest'
15-
python-version: "3.12"
15+
python-version: "3.13"
1616
environment-file: environment-cn.yml
1717
activate-environment: quantecon
1818
- name: Graphics Support

.github/workflows/_future/ci-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
auto-update-conda: true
1313
auto-activate-base: true
1414
miniconda-version: 'latest'
15-
python-version: "3.12"
15+
python-version: "3.13"
1616
environment-file: environment.yml
1717
activate-environment: quantecon
1818
- name: Download "build" folder (cache)

.github/workflows/_future/linkcheck.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
os: ["ubuntu-latest"]
16-
python-version: ["3.12"]
16+
python-version: ["3.13"]
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v4
@@ -23,7 +23,7 @@ jobs:
2323
auto-update-conda: true
2424
auto-activate-base: true
2525
miniconda-version: 'latest'
26-
python-version: "3.12"
26+
python-version: "3.13"
2727
environment-file: environment.yml
2828
activate-environment: quantecon
2929
- name: Download "build" folder (cache)

.github/workflows/cache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
auto-update-conda: true
1717
auto-activate-base: true
1818
miniconda-version: 'latest'
19-
python-version: "3.12"
19+
python-version: "3.13"
2020
environment-file: environment.yml
2121
activate-environment: quantecon
2222
- name: graphviz Support # TODO: required?

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
auto-update-conda: true
1313
auto-activate-base: true
1414
miniconda-version: 'latest'
15-
python-version: "3.12"
15+
python-version: "3.13"
1616
environment-file: environment.yml
1717
activate-environment: quantecon
1818
- name: Graphics Support #TODO: Review if graphviz is needed

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
auto-update-conda: true
1717
auto-activate-base: true
1818
miniconda-version: 'latest'
19-
python-version: "3.12"
19+
python-version: "3.13"
2020
environment-file: environment.yml
2121
activate-environment: quantecon
2222
- name: Install latex dependencies

environment-cn.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ channels:
33
- default
44
- conda-forge
55
dependencies:
6-
- python=3.12
7-
- anaconda=2024.10
6+
- python=3.13
7+
- anaconda=2025.06
88
- pip
99
- pip:
10-
- jupyter-book==1.0.3
11-
- quantecon-book-theme==0.8.2
12-
- sphinx-tojupyter==0.3.0
10+
- jupyter-book==1.0.4post1
11+
- quantecon-book-theme==0.9.2
12+
- sphinx-tojupyter==0.3.1
1313
- sphinxext-rediraffe==0.2.7
1414
- sphinx_reredirects==0.1.4
1515
- sphinx-exercise==1.0.1
16-
- sphinx-proof==0.2.0
16+
- sphinx-proof==0.2.1
1717
- ghp-import==1.1.0
18-
- sphinxcontrib-youtube==1.3.0 #Version 1.3.0 is required as quantecon-book-theme is only compatible with sphinx<=5
18+
- sphinxcontrib-youtube==1.4.1 #Version 1.3.0 is required as quantecon-book-theme is only compatible with sphinx<=5
1919
- sphinx-togglebutton==0.3.2
20-
- --index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
20+
- --index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple

environment.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@ name: quantecon
22
channels:
33
- default
44
dependencies:
5-
- python=3.12
6-
- anaconda=2024.10
5+
- python=3.13
6+
- anaconda=2025.06
77
- pip
88
- pip:
9-
- jupyter-book==1.0.3
10-
- quantecon-book-theme==0.8.2
11-
- sphinx-tojupyter==0.3.0
9+
- jupyter-book==1.0.4post1
10+
- quantecon-book-theme==0.9.2
11+
- sphinx-tojupyter==0.3.1
1212
- sphinxext-rediraffe==0.2.7
13-
- sphinx-reredirects==0.1.4
1413
- sphinx-exercise==1.0.1
15-
- sphinx-proof==0.2.0
16-
- ghp-import==1.1.0
17-
- sphinxcontrib-youtube==1.3.0 #Version 1.3.0 is required as quantecon-book-theme is only compatible with sphinx<=5
14+
- sphinx-proof==0.2.1
15+
- sphinxcontrib-youtube==1.4.1
1816
- sphinx-togglebutton==0.3.2
19-
17+
- sphinx-reredirects==0.1.4

lectures/_config.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,40 @@ sphinx:
9191
launch_buttons:
9292
colab_url : https://colab.research.google.com
9393
intersphinx_mapping:
94+
intersphinx_mapping:
95+
intermediate:
96+
- https://python.quantecon.org/
97+
- null
98+
pyprog:
99+
- https://python-programming.quantecon.org/
100+
- null
94101
intro:
95102
- "https://quantecon.github.io/lecture-intro.zh-cn/"
96103
- null
104+
dle:
105+
- https://quantecon.github.io/lecture-dle/
106+
- null
107+
dps:
108+
- https://quantecon.github.io/lecture-dps/
109+
- null
110+
eqm:
111+
- https://quantecon.github.io/lecture-eqm/
112+
- null
113+
stats:
114+
- https://quantecon.github.io/lecture-stats/
115+
- null
116+
tools:
117+
- https://quantecon.github.io/lecture-tools-techniques/
118+
- null
119+
dynam:
120+
- https://quantecon.github.io/lecture-dynamics/
121+
- null
122+
advanced:
123+
- "https://python-advanced.quantecon.org"
124+
- null
125+
jax:
126+
- "https://jax.quantecon.org/"
127+
- null
97128
mathjax3_config:
98129
tex:
99130
macros:

0 commit comments

Comments
 (0)