Skip to content

Commit a0a5369

Browse files
authored
Merge pull request #75 from matthew-brett/jb1-py12
JupyterBook 1 / Python 3.12 / Fix warnings
2 parents 69f245c + 2f02ca9 commit a0a5369

12 files changed

Lines changed: 656 additions & 887 deletions

.github/workflows/deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
matrix:
2222
os: [ubuntu-latest]
23-
python-version: [3.8]
23+
python-version: [3.12]
2424
# TODO Uncomment when skimage theme is ready
2525
# node-version: [15]
2626
steps:
@@ -64,7 +64,7 @@ jobs:
6464
- name: Build the book
6565
env:
6666
DISPLAY: ":99.0"
67-
run: jupyter-book build .
67+
run: jupyter-book build -W .
6868

6969
# Deploy the book's HTML to github pages
7070
- name: GitHub Pages action
@@ -73,4 +73,4 @@ jobs:
7373
with:
7474
github_token: ${{ secrets.GITHUB_TOKEN }}
7575
publish_dir: ./_build/html
76-
cname: scikit-image.org
76+
cname: scikit-image.org

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ build
99
*~
1010
*pano-advanced-output.png
1111
book/lessons
12+
# Jupyter Book 1 output.
13+
_build/

_config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@ exclude_patterns:
66
- '*/not_yet_booked/*'
77
- '*/solutions/*'
88
- '*/_build/*'
9+
- README.md
10+
- index.md
911
execute:
10-
execute_notebooks : 'auto'
12+
execute_notebooks : 'cache'
13+
timeout: 180

index.ipynb

Lines changed: 0 additions & 54 deletions
This file was deleted.

lectures/00_images_are_arrays.ipynb

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"cell_type": "markdown",
138138
"metadata": {},
139139
"source": [
140-
"### Other shapes, and their meanings\n",
140+
"## Other shapes, and their meanings\n",
141141
"\n",
142142
"|Image type|Coordinates|\n",
143143
"|:---|:---|\n",
@@ -577,8 +577,12 @@
577577
],
578578
"metadata": {
579579
"celltoolbar": "Tags",
580+
"jupytext": {
581+
"notebook_metadata_filter": "all,-language_info",
582+
"split_at_heading": true
583+
},
580584
"kernelspec": {
581-
"display_name": "Python 3",
585+
"display_name": "Python 3 (ipykernel)",
582586
"language": "python",
583587
"name": "python3"
584588
},
@@ -592,7 +596,7 @@
592596
"name": "python",
593597
"nbconvert_exporter": "python",
594598
"pygments_lexer": "ipython3",
595-
"version": "3.8.2"
599+
"version": "3.12.7"
596600
}
597601
},
598602
"nbformat": 4,

lectures/4_segmentation.ipynb

Lines changed: 437 additions & 84 deletions
Large diffs are not rendered by default.

lectures/5_tophat_filters.ipynb

Lines changed: 92 additions & 309 deletions
Large diffs are not rendered by default.

lectures/6_watershed_tricks.ipynb

Lines changed: 31 additions & 116 deletions
Large diffs are not rendered by default.

lectures/7_performance.ipynb

Lines changed: 72 additions & 316 deletions
Large diffs are not rendered by default.

preparation.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
---
2+
orphan: true
3+
---
4+
15
# Preparation
26

37
## Format

0 commit comments

Comments
 (0)