Skip to content

Commit 29dbda9

Browse files
authored
Set upper limit on version of nbconvert (HinodeXRT#215)
* Update .gitignore * Run nbclean * Remove empty cell at end of notebook * Rename notebook without underscore * Update GitHub Action to install pandoc from repo * Make GitHub Action more concise * Set upper limit on nbconvert * Revert some changes ...while adding some backticks * Revert a change * Remove upper limit on nbconvert * Build docs on macOS rather than Ubuntu * Use brew to install graphviz & pandoc * Revert "Use brew to install graphviz & pandoc" This reverts commit b72ac70. * Revert "Build docs on macOS rather than Ubuntu" This reverts commit 632ed78. * Revert "Remove upper limit on nbconvert" This reverts commit 0e2ce80.
1 parent 399b98c commit 29dbda9

File tree

5 files changed

+14
-20
lines changed

5 files changed

+14
-20
lines changed

.github/workflows/testing.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
include:
7272

7373
- name: Documentation
74-
python: '3.10'
74+
python: '3.12'
7575

7676
steps:
7777

@@ -88,8 +88,16 @@ jobs:
8888
- name: Install nox
8989
run: python -m pip install --progress-bar off --upgrade nox
9090

91-
- name: Install graphviz and pandoc
92-
run: sudo apt install graphviz pandoc
91+
- name: Install graphviz
92+
run: sudo apt install graphviz
93+
94+
- name: Install pandoc
95+
run: |
96+
PANDOC_VERSION="3.1.11.1"
97+
wget -q https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/pandoc-${PANDOC_VERSION}-1-amd64.deb
98+
sudo dpkg -i pandoc-${PANDOC_VERSION}-1-amd64.deb
99+
rm pandoc-${PANDOC_VERSION}-1-amd64.deb
100+
pandoc --version
93101
94102
- name: Build documentation
95103
run: nox -e build_docs_nitpicky -- -q

docs/notebooks/data_analysis/Deconvolving_XRT_images.ipynb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,6 @@
9090
"fig.subplots_adjust(wspace=0.5)\n",
9191
"plt.show()"
9292
]
93-
},
94-
{
95-
"cell_type": "code",
96-
"execution_count": null,
97-
"id": "549d08ea",
98-
"metadata": {},
99-
"outputs": [],
100-
"source": []
10193
}
10294
],
10395
"metadata": {

docs/notebooks/data_analysis/Remove_lightleak.ipynb

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"id": "075bbcc4",
66
"metadata": {},
77
"source": [
8-
"# Using the remove_lightleak function to analyze XRT composite images"
8+
"# Using the `remove_lightleak` function to analyze XRT composite images"
99
]
1010
},
1111
{
@@ -130,14 +130,6 @@
130130
"fig.subplots_adjust(wspace=0.5)\n",
131131
"plt.show()"
132132
]
133-
},
134-
{
135-
"cell_type": "code",
136-
"execution_count": null,
137-
"id": "eda9e234",
138-
"metadata": {},
139-
"outputs": [],
140-
"source": []
141133
}
142134
],
143135
"metadata": {

requirements/docs.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ docutils >= 0.18
88
ipykernel
99
ipython
1010
jinja2 != 3.1
11+
nbconvert < 7.14
1112
nbsphinx >= 0.9
1213
numpydoc >= 1.2
1314
pillow

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ docs =
6464
ipykernel
6565
ipython
6666
jinja2 != 3.1
67+
nbconvert < 7.14
6768
nbsphinx >= 0.9
6869
numpydoc >= 1.2
6970
pillow

0 commit comments

Comments
 (0)