Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set upper limit on version of nbconvert #215

Merged
merged 16 commits into from
Feb 8, 2024
Merged

Set upper limit on version of nbconvert #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
be76f83
Update .gitignore
namurphy Feb 1, 2024
902f004
Run nbclean
namurphy Feb 1, 2024
59fff86
Remove empty cell at end of notebook
namurphy Feb 2, 2024
cc81d9e
Rename notebook without underscore
namurphy Feb 2, 2024
a6e4269
Update GitHub Action to install pandoc from repo
namurphy Feb 2, 2024
e87ac93
Make GitHub Action more concise
namurphy Feb 2, 2024
25180ef
Set upper limit on nbconvert
namurphy Feb 2, 2024
4043122
Merge branch 'doc-error-raw-directive' of github.com:namurphy/xrtpy i…
namurphy Feb 2, 2024
efeb594
Revert some changes
namurphy Feb 2, 2024
cb7a2d0
Revert a change
namurphy Feb 2, 2024
0e2ce80
Remove upper limit on nbconvert
namurphy Feb 2, 2024
632ed78
Build docs on macOS rather than Ubuntu
namurphy Feb 2, 2024
b72ac70
Use brew to install graphviz & pandoc
namurphy Feb 2, 2024
c058ec6
Revert "Use brew to install graphviz & pandoc"
namurphy Feb 2, 2024
514858d
Revert "Build docs on macOS rather than Ubuntu"
namurphy Feb 2, 2024
b688c16
Revert "Remove upper limit on nbconvert"
namurphy Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .github/workflows/testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
include:

- name: Documentation
python: '3.10'
python: '3.12'

steps:

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

- name: Install graphviz and pandoc
run: sudo apt install graphviz pandoc
- name: Install graphviz
run: sudo apt install graphviz

- name: Install pandoc
run: |
PANDOC_VERSION="3.1.11.1"
wget -q https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/pandoc-${PANDOC_VERSION}-1-amd64.deb
sudo dpkg -i pandoc-${PANDOC_VERSION}-1-amd64.deb
rm pandoc-${PANDOC_VERSION}-1-amd64.deb
pandoc --version
Comment on lines +94 to +100
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This didn't fix the problem, but it did get rid of the warning.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will create an issue to ensure that we do not overlook this matter, as it could have a significant impact in the future.


- name: Build documentation
run: nox -e build_docs_nitpicky -- -q
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ target/
# IPython
profile_default/
ipython_config.py
Untitled*.ipynb

# pyenv
.python-version
Expand Down
8 changes: 0 additions & 8 deletions docs/notebooks/data_analysis/Deconvolving_XRT_images.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,6 @@
"fig.subplots_adjust(wspace=0.5)\n",
"plt.show()"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "549d08ea",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand Down
10 changes: 1 addition & 9 deletions docs/notebooks/data_analysis/Remove_lightleak.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": "075bbcc4",
"metadata": {},
"source": [
"# Using the remove_lightleak function to analyze XRT composite images"
"# Using the `remove_lightleak` function to analyze XRT composite images"
]
},
{
Expand Down Expand Up @@ -131,14 +131,6 @@
"fig.subplots_adjust(wspace=0.5)\n",
"plt.show()"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "eda9e234",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand Down
1 change: 1 addition & 0 deletions requirements/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ docutils >= 0.18
ipykernel
ipython
jinja2 != 3.1
nbconvert < 7.14
nbsphinx >= 0.9
numpydoc >= 1.2
pillow
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ docs =
ipykernel
ipython
jinja2 != 3.1
nbconvert < 7.14
nbsphinx >= 0.9
numpydoc >= 1.2
pillow
Expand Down
Loading