Skip to content

Commit 0ec1c7c

Browse files
authored
Merge pull request #27 from fangohr/update-versions
Update versions
2 parents 9da4c68 + 49cf704 commit 0ec1c7c

File tree

10 files changed

+1964
-1074
lines changed

10 files changed

+1964
-1074
lines changed

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM debian:bullseye-slim
22

3-
RUN apt-get update -y && apt-get install -y texlive-xetex latexmk texlive-xetex fonts-freefont-otf \
4-
python3 python3-pip git zile
3+
RUN apt-get update -y && apt-get install -y texlive-xetex latexmk texlive-xetex \
4+
texlive-fonts-extra fonts-freefont-otf python3 python3-pip git zile
55

66
COPY poetry.lock pyproject.toml /opt/
77

@@ -13,4 +13,8 @@ RUN poetry install -vvv
1313

1414
RUN mkdir -p /io
1515
WORKDIR /io
16+
17+
# Need this for one nbval and chapter 1
18+
RUN ln -s /usr/bin/python3 /usr/local/bin/python
19+
1620
CMD ["/bin/bash"]

book/01-introduction.ipynb

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@
291291
},
292292
{
293293
"cell_type": "code",
294-
"execution_count": 2,
294+
"execution_count": 1,
295295
"metadata": {},
296296
"outputs": [
297297
{
@@ -316,14 +316,15 @@
316316
},
317317
{
318318
"cell_type": "code",
319-
"execution_count": 3,
319+
"execution_count": 2,
320320
"metadata": {},
321321
"outputs": [
322322
{
323323
"name": "stdout",
324324
"output_type": "stream",
325325
"text": [
326-
"This is the content of the file hello.txt\n"
326+
"This is the content of the file hello.txt\n",
327+
"\n"
327328
]
328329
}
329330
],
@@ -409,7 +410,7 @@
409410
],
410411
"metadata": {
411412
"kernelspec": {
412-
"display_name": "Python 3",
413+
"display_name": "Python 3 (ipykernel)",
413414
"language": "python",
414415
"name": "python3"
415416
},
@@ -423,7 +424,7 @@
423424
"name": "python",
424425
"nbconvert_exporter": "python",
425426
"pygments_lexer": "ipython3",
426-
"version": "3.9.1"
427+
"version": "3.9.7"
427428
}
428429
},
429430
"nbformat": 4,

book/12-symbolic-computation.ipynb

Lines changed: 21 additions & 34 deletions
Large diffs are not rendered by default.

book/13-numeric-computation.ipynb

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
},
121121
{
122122
"cell_type": "code",
123-
"execution_count": 11,
123+
"execution_count": 1,
124124
"metadata": {},
125125
"outputs": [
126126
{
@@ -129,7 +129,7 @@
129129
"'1.00000000000000000000'"
130130
]
131131
},
132-
"execution_count": 11,
132+
"execution_count": 1,
133133
"metadata": {},
134134
"output_type": "execute_result"
135135
}
@@ -140,7 +140,7 @@
140140
},
141141
{
142142
"cell_type": "code",
143-
"execution_count": 12,
143+
"execution_count": 2,
144144
"metadata": {},
145145
"outputs": [
146146
{
@@ -149,7 +149,7 @@
149149
"'0.10000000000000000555'"
150150
]
151151
},
152-
"execution_count": 12,
152+
"execution_count": 2,
153153
"metadata": {},
154154
"output_type": "execute_result"
155155
}
@@ -160,7 +160,7 @@
160160
},
161161
{
162162
"cell_type": "code",
163-
"execution_count": 13,
163+
"execution_count": 3,
164164
"metadata": {},
165165
"outputs": [
166166
{
@@ -169,7 +169,7 @@
169169
"'0.20000000000000001110'"
170170
]
171171
},
172-
"execution_count": 13,
172+
"execution_count": 3,
173173
"metadata": {},
174174
"output_type": "execute_result"
175175
}
@@ -180,7 +180,7 @@
180180
},
181181
{
182182
"cell_type": "code",
183-
"execution_count": 14,
183+
"execution_count": 4,
184184
"metadata": {},
185185
"outputs": [
186186
{
@@ -189,7 +189,7 @@
189189
"'0.29999999999999998890'"
190190
]
191191
},
192-
"execution_count": 14,
192+
"execution_count": 4,
193193
"metadata": {},
194194
"output_type": "execute_result"
195195
}
@@ -253,14 +253,14 @@
253253
},
254254
{
255255
"cell_type": "code",
256-
"execution_count": 15,
256+
"execution_count": 5,
257257
"metadata": {},
258258
"outputs": [
259259
{
260260
"name": "stdout",
261261
"output_type": "stream",
262262
"text": [
263-
"x =0.10000000000000001\n",
263+
" x =0.10000000000000001\n",
264264
" x =0.20000000000000001\n",
265265
" x =0.30000000000000004\n",
266266
" x =0.40000000000000002\n",
@@ -291,14 +291,14 @@
291291
},
292292
{
293293
"cell_type": "code",
294-
"execution_count": 16,
294+
"execution_count": 6,
295295
"metadata": {},
296296
"outputs": [
297297
{
298298
"name": "stdout",
299299
"output_type": "stream",
300300
"text": [
301-
"x =0.10000000000000001\n",
301+
" x =0.10000000000000001\n",
302302
" x =0.20000000000000001\n",
303303
" x =0.30000000000000004\n",
304304
" x =0.40000000000000002\n",
@@ -319,10 +319,8 @@
319319
},
320320
{
321321
"cell_type": "code",
322-
"execution_count": 17,
323-
"metadata": {
324-
"collapsed": true
325-
},
322+
"execution_count": 7,
323+
"metadata": {},
326324
"outputs": [],
327325
"source": [
328326
"x=0.10000000000000001\n",
@@ -355,7 +353,7 @@
355353
},
356354
{
357355
"cell_type": "code",
358-
"execution_count": 18,
356+
"execution_count": 8,
359357
"metadata": {},
360358
"outputs": [
361359
{
@@ -404,7 +402,7 @@
404402
},
405403
{
406404
"cell_type": "code",
407-
"execution_count": 19,
405+
"execution_count": 9,
408406
"metadata": {},
409407
"outputs": [
410408
{
@@ -413,11 +411,11 @@
413411
"text": [
414412
"loop using float dx:\n",
415413
" deviation is -1.88483681995422e-08\n",
416-
"float loop n=100000 takes 0.00778 seconds\n",
414+
"float loop n=100000 takes 0.00408 seconds\n",
417415
"loop using sympy symbolic dx:\n",
418416
" deviation is 0\n",
419-
"sympy loop n = 100000 takes 1.61389 seconds\n",
420-
"Symbolic loop is a factor 207.4 slower.\n"
417+
"sympy loop n = 100000 takes 0.34109 seconds\n",
418+
"Symbolic loop is a factor 83.6 slower.\n"
421419
]
422420
}
423421
],
@@ -506,7 +504,7 @@
506504
],
507505
"metadata": {
508506
"kernelspec": {
509-
"display_name": "Python 3",
507+
"display_name": "Python 3 (ipykernel)",
510508
"language": "python",
511509
"name": "python3"
512510
},
@@ -520,9 +518,9 @@
520518
"name": "python",
521519
"nbconvert_exporter": "python",
522520
"pygments_lexer": "ipython3",
523-
"version": "3.8.6-final"
521+
"version": "3.9.7"
524522
}
525523
},
526524
"nbformat": 4,
527525
"nbformat_minor": 1
528-
}
526+
}

book/14-numpy.ipynb

Lines changed: 27 additions & 25 deletions
Large diffs are not rendered by default.

book/_config.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,21 @@ html:
3838

3939
# Allow parsing of "<img src=..." tags in markdown cells (used in Chapter 15 on visualisation)
4040
parse:
41-
myst_extended_syntax: true
41+
myst_enable_extensions: # default extensions to enable in the myst parser. See https://myst-parser.readthedocs.io/en/latest/using/syntax-optional.html
42+
# - amsmath
43+
- colon_fence
44+
# - deflist
45+
- dollarmath
46+
# - html_admonition
47+
- html_image
48+
# - linkify
49+
# - replacements
50+
# - smartquotes
51+
- substitution
52+
- tasklist
53+
myst_url_schemes: [mailto, http, https] # URI schemes that will be recognised as external URLs in Markdown links
54+
# myst_dmath_double_inline: true # Allow display math ($$) within an inline context
55+
4256

4357

4458
sphinx:

book/_toc.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
# Table of content
2-
# Learn more at https://jupyterbook.org/customize/toc.html
3-
#
4-
- file: opening
1+
format: jb-article
2+
root: opening
3+
options:
54
numbered: true
6-
5+
sections:
76
- file: 01-introduction
87
- file: 02-powerful-calculator
98
- file: 03-data-types-structures

0 commit comments

Comments
 (0)