Skip to content

Commit aeb2da9

Browse files
mmckykp992
andauthored
MAINT: anaconda=2024.02 and upgrade GA versions (#157)
* MAINT: anaconda=2024.02 and upgrade GA versions * TMP: disable cache * update version numbers in github workflows * fix prop_cycle error * re-enable build cache --------- Co-authored-by: kp992 <[email protected]>
1 parent 03196de commit aeb2da9

File tree

6 files changed

+20
-21
lines changed

6 files changed

+20
-21
lines changed

.github/workflows/cache.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v4
1515
- name: Setup Anaconda
16-
uses: conda-incubator/setup-miniconda@v2
16+
uses: conda-incubator/setup-miniconda@v3
1717
with:
1818
auto-update-conda: true
1919
auto-activate-base: true
@@ -39,13 +39,13 @@ jobs:
3939
run: |
4040
jb build lectures --path-output ./ -W --keep-going
4141
- name: Upload Execution Reports
42-
uses: actions/upload-artifact@v2
42+
uses: actions/upload-artifact@v4
4343
if: failure()
4444
with:
4545
name: execution-reports
4646
path: _build/html/reports
4747
- name: Upload "_build" folder (cache)
48-
uses: actions/upload-artifact@v2
48+
uses: actions/upload-artifact@v4
4949
with:
5050
name: build-cache
5151
path: _build

.github/workflows/execution.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
python-version: ["3.11"]
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
- uses: conda-incubator/setup-miniconda@v2
1919
with:
2020
auto-update-conda: true
@@ -41,7 +41,7 @@ jobs:
4141
shell: bash -l {0}
4242
run: jb build lectures --path-output=./ -W --keep-going
4343
- name: Upload Execution Reports
44-
uses: actions/upload-artifact@v2
44+
uses: actions/upload-artifact@v4
4545
if: failure()
4646
with:
4747
name: execution-reports
@@ -56,8 +56,8 @@ jobs:
5656
python-version: ["3.11"]
5757
steps:
5858
- name: Checkout
59-
uses: actions/checkout@v2
60-
- uses: conda-incubator/setup-miniconda@v2
59+
uses: actions/checkout@v4
60+
- uses: conda-incubator/setup-miniconda@v3
6161
with:
6262
auto-update-conda: true
6363
python-version: ${{ matrix.python-version }}
@@ -73,7 +73,7 @@ jobs:
7373
shell: bash -l {0}
7474
run: jb build lectures --path-output=./ -W --keep-going
7575
- name: Upload Execution Reports
76-
uses: actions/upload-artifact@v2
76+
uses: actions/upload-artifact@v4
7777
if: failure()
7878
with:
7979
name: execution-reports

.github/workflows/linkcheck.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
python-version: ["3.11"]
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v4
2020
- name: Setup Anaconda
21-
uses: conda-incubator/setup-miniconda@v2
21+
uses: conda-incubator/setup-miniconda@v3
2222
with:
2323
auto-update-conda: true
2424
auto-activate-base: true
@@ -27,7 +27,7 @@ jobs:
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@v3
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

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v4
1313
- name: Setup Anaconda
14-
uses: conda-incubator/setup-miniconda@v2
14+
uses: conda-incubator/setup-miniconda@v3
1515
with:
1616
auto-update-conda: true
1717
auto-activate-base: true
@@ -39,7 +39,7 @@ jobs:
3939
shell: bash -l {0}
4040
run: pip list
4141
- name: Download "build" folder (cache)
42-
uses: dawidd6/action-download-artifact@v2
42+
uses: dawidd6/action-download-artifact@v4
4343
with:
4444
workflow: cache.yml
4545
branch: main
@@ -79,7 +79,7 @@ jobs:
7979
publish_dir: _build/html/
8080
cname: python-advanced.quantecon.org
8181
- name: Upload "_build" folder (cache)
82-
uses: actions/upload-artifact@v2
82+
uses: actions/upload-artifact@v4
8383
with:
8484
name: build-cache
8585
path: _build

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- default
44
dependencies:
55
- python=3.11
6-
- anaconda=2023.09
6+
- anaconda=2024.02
77
- pip
88
- pip:
99
- jupyter-book==0.15.1

lectures/smoothing_tax.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -607,14 +607,13 @@ class TaxSmoothingExample:
607607
608608
fig, ax = plt.subplots()
609609
ax.set_title('Cumulative return path (complete markets)')
610-
line1 = ax.plot(np.arange(N), self.RT_path)[0]
610+
line1 = ax.plot(np.arange(N), self.RT_path, color='blue')[0]
611611
c1 = line1.get_color()
612612
ax.set_xlabel('Periods')
613613
ax.set_ylabel('Cumulative return', color=c1)
614614
615615
ax_ = ax.twinx()
616-
ax_._get_lines.prop_cycler = ax._get_lines.prop_cycler
617-
line2 = ax_.plot(np.arange(N), self.g_path, ls='--')[0]
616+
line2 = ax_.plot(np.arange(N), self.g_path, ls='--', color='green')[0]
618617
c2 = line2.get_color()
619618
ax_.set_ylabel('Government expenditures', color=c2)
620619

0 commit comments

Comments
 (0)