Skip to content

Commit c3ee6ed

Browse files
authored
Merge pull request #108 from aeturrell/fixing-ci-issues
consistent python 3 kernel names; stop ruff formatting away sympy import, fixing bibliography
2 parents d21e2f6 + 620871e commit c3ee6ed

64 files changed

Lines changed: 222 additions & 127 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
uv run quarto render --execute
6767
env:
6868
# This forces Quarto to use the Python inside your uv venv
69-
QUARTO_PYTHON: .venv/bin/python
69+
QUARTO_PYTHON: ${{ github.workspace }}/.venv/bin/python
7070

7171

7272
- name: Check if there is a parent commit

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
uv run quarto render --execute
7575
env:
7676
# This forces Quarto to use the Python inside your uv venv
77-
QUARTO_PYTHON: .venv/bin/python
77+
QUARTO_PYTHON: ${{ github.workspace }}/.venv/bin/python
7878

7979
- name: success
8080
run: |

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ To make changes:
2828
1. create a new branch
2929
2. install the Python environment or alternatively build and work in the docker image (which comes with the Python environment)
3030
3. make your content changes, amending the Python environment as necessary (eg add packages via `uv add <packagename>`)
31-
4. Check your changes look right with `uv run quarto render --execute` to render the book, and `uv run python -m http.server -d _book 8000` to read it locally
31+
4. Check your changes look right with `uv run quarto render --execute` to render the book, and `uv run python -m http.server -d _book 8000` to read it locally then head to "http://localhost:8000" to see it.
3232
5. run pre-commit using `uv run pre-commit run --all-files`
3333
6. if the checks clear, commit your change(s)
3434
7. make a pull request

‎_quarto.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ book:
134134
- part: "End Matter"
135135
chapters:
136136
- contributing.qmd
137-
- zreferences.qmd
137+
- references.qmd
138138

139139
bibliography: references.bib
140140
csl: csl/chicago-author-date.csl
@@ -159,3 +159,5 @@ format:
159159
execute:
160160
freeze: auto
161161
error: false
162+
163+
jupyter: python3

‎auto-office.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
"metadata": {
219219
"celltoolbar": "Tags",
220220
"kernelspec": {
221-
"display_name": "Python 3.10.12 ('codeforecon')",
221+
"display_name": "Python 3 (ipykernel)",
222222
"language": "python",
223223
"name": "python3"
224224
},
@@ -232,7 +232,7 @@
232232
"name": "python",
233233
"nbconvert_exporter": "python",
234234
"pygments_lexer": "ipython3",
235-
"version": "3.10.12"
235+
"version": "3"
236236
},
237237
"vscode": {
238238
"interpreter": {

‎code-advanced.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@
809809
"metadata": {
810810
"celltoolbar": "Tags",
811811
"kernelspec": {
812-
"display_name": "codeforecon",
812+
"display_name": "Python 3 (ipykernel)",
813813
"language": "python",
814814
"name": "python3"
815815
},

‎code-advcd-best-practice.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@
10721072
"metadata": {
10731073
"celltoolbar": "Tags",
10741074
"kernelspec": {
1075-
"display_name": "Python 3.10.12 ('codeforecon')",
1075+
"display_name": "Python 3 (ipykernel)",
10761076
"language": "python",
10771077
"name": "python3"
10781078
},

‎code-basics.ipynb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1683,7 +1683,8 @@
16831683
"main_language": "python"
16841684
},
16851685
"kernelspec": {
1686-
"display_name": "Python 3.8.12 64-bit ('codeforecon': conda)",
1686+
"display_name": "Python 3 (ipykernel)",
1687+
"language": "python",
16871688
"name": "python3"
16881689
},
16891690
"language_info": {

‎code-further-advanced.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@
11691169
"metadata": {
11701170
"celltoolbar": "Tags",
11711171
"kernelspec": {
1172-
"display_name": "Python 3.10.12 ('codeforecon')",
1172+
"display_name": "Python 3 (ipykernel)",
11731173
"language": "python",
11741174
"name": "python3"
11751175
},

‎code-where.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
"metadata": {
151151
"celltoolbar": "Tags",
152152
"kernelspec": {
153-
"display_name": "Python 3.10.12 ('codeforecon')",
153+
"display_name": "Python 3 (ipykernel)",
154154
"language": "python",
155155
"name": "python3"
156156
},

0 commit comments

Comments
 (0)