Skip to content

Commit d53575a

Browse files
committed
Merge branch 'main' into qtcu
2 parents cca6390 + 35e22c0 commit d53575a

File tree

3 files changed

+30
-24
lines changed

3 files changed

+30
-24
lines changed

.github/workflows/nightly_ci.yaml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@ jobs:
1919
qutip-branch: 'qutip-4.7.X'
2020
- qutip-version: '5'
2121
qutip-branch: 'master'
22-
steps:
23-
- uses: actions/checkout@v4
24-
- uses: gaurav-nelson/github-action-markdown-link-check@v1
25-
with:
26-
use-quiet-mode: 'yes'
27-
folder-path: tutorials-v${{ matrix.qutip-version }}
28-
#use config file to define 403 and 405 errors as valid links
29-
#(APS blocks this link check)
30-
config-file: mlc_config.json
3122

3223
- name: Setup Conda
3324
uses: conda-incubator/setup-miniconda@v3
@@ -78,6 +69,9 @@ jobs:
7869
sudo apt install ffmpeg
7970
sudo apt install texlive-latex-extra
8071
72+
- name: Show environment
73+
run: conda list
74+
8175
- name: Convert Notebooks
8276
run: |
8377
rm -rf notebooks
@@ -107,6 +101,18 @@ jobs:
107101
notebooks/*.ipynb
108102
notebooks/**/*.ipynb
109103
104+
markdown-link-check:
105+
runs-on: ubuntu-latest
106+
steps:
107+
- uses: actions/checkout@v4
108+
- uses: tcort/github-action-markdown-link-check@v1
109+
with:
110+
use-quiet-mode: 'yes'
111+
folder-path: 'tutorials-v4, tutorials-v5'
112+
#use config file to define 403 and 405 errors as valid links
113+
#(APS blocks this link check)
114+
config-file: mlc_config.json
115+
110116

111117
finalise:
112118
needs: pytests

.github/workflows/notebook_ci.yaml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@v4
2525

26-
- uses: gaurav-nelson/github-action-markdown-link-check@v1
27-
with:
28-
use-quiet-mode: 'yes'
29-
folder-path: tutorials-v${{ matrix.qutip-version }}
30-
#use config file to define 403 and 405 errors as valid links
31-
#(APS blocks this link check)
32-
config-file: mlc_external_config.json
33-
3426
- name: Setup Conda
3527
uses: conda-incubator/setup-miniconda@v3
3628
with:
@@ -80,6 +72,9 @@ jobs:
8072
sudo apt install ffmpeg
8173
sudo apt install texlive-latex-extra
8274
75+
- name: Show environment
76+
run: conda list
77+
8378
- name: Convert Notebooks
8479
run: |
8580
rm -rf notebooks
@@ -115,13 +110,17 @@ jobs:
115110
notebooks/*.ipynb
116111
notebooks/**/*.ipynb
117112
118-
- uses: gaurav-nelson/github-action-markdown-link-check@v1
119-
with:
120-
use-quiet-mode: 'yes'
121-
folder-path: tutorials-v${{ matrix.qutip-version }}
122-
#use config file to define 403 and 405 errors as valid links
123-
#(APS blocks this link check)
124-
config-file: mlc_config.json
113+
markdown-link-check:
114+
runs-on: ubuntu-latest
115+
steps:
116+
- uses: actions/checkout@v4
117+
- uses: tcort/github-action-markdown-link-check@v1
118+
with:
119+
use-quiet-mode: 'yes'
120+
folder-path: 'tutorials-v4, tutorials-v5'
121+
#use config file to define 403 and 405 errors as valid links
122+
#(APS blocks this link check)
123+
config-file: mlc_external_config.json
125124

126125
publish:
127126
needs: pytests

test_environment-v4.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ dependencies:
1414
- jupytext==1.13.8
1515
- jupyter==1.0.0
1616
- ipykernel==6.17.1 # 6.18.0 was yanked but is still present on conda-forge
17+
- matplotlib-inline==0.1.7

0 commit comments

Comments
 (0)