Skip to content

Commit 0170653

Browse files
committed
removed unwanted f-strings in the tutorials and minor fix in the workflows
1 parent b3e4112 commit 0170653

File tree

13 files changed

+35
-29
lines changed

13 files changed

+35
-29
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
uses: s-weigand/setup-conda@v1
2323
with:
2424
python-version: ${{ matrix.python-version }}
25-
auto-update-conda: true
26-
conda-channels: anaconda, conda-forge
25+
update-conda: true
26+
conda-channels: conda-forge, anaconda
2727

2828
- name: Install pythonocc-core (Conda)
29-
run: conda install --yes pythonocc-core
29+
run: conda install --yes -c conda-forge -c anaconda pythonocc-core
3030
shell: bash
3131

3232
- name: Install pip dependencies

.github/workflows/testing_pr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
uses: s-weigand/setup-conda@v1
2727
with:
2828
python-version: ${{ matrix.python-version }}
29-
auto-update-conda: true
30-
conda-channels: anaconda, conda-forge
29+
update-conda: true
30+
conda-channels: conda-forge, anaconda
3131

3232
- name: Install pythonocc-core (Conda)
33-
run: conda install --yes pythonocc-core
33+
run: conda install --yes -c conda-forge -c anaconda pythonocc-core
3434
shell: bash
3535

3636
- name: Install pip dependencies
@@ -40,4 +40,4 @@ jobs:
4040
python -m pip install .[test]
4141
4242
- name: Run tests with pytest
43-
run: python -m pytest
43+
run: python -m pytest -v

tutorials/tutorial1/tutorial-1-ffd.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
" import pygem\n",
5555
" print(f\"PyGeM version: {pygem.__version__}\")\n",
5656
"except ImportError:\n",
57-
" print(f\"PyGeM not found. Installing with tutorial dependencies\")\n",
57+
" print(\"PyGeM not found. Installing with tutorial dependencies\")\n",
5858
" import subprocess\n",
5959
" subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"-e\", \".[tut]\"])\n",
6060
" import pygem\n",

tutorials/tutorial1/tutorial-1-ffd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
print(f"PyGeM version: {pygem.__version__}")
1313
except ImportError:
14-
print(f"PyGeM not found. Installing...")
14+
print("PyGeM not found. Installing...")
1515
import subprocess
1616

1717
# Installing from local source. It can be replaced with github installation once pushed and merged.

tutorials/tutorial2/tutorial-2-iges.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
{
2727
"cell_type": "code",
28-
"execution_count": 1,
28+
"execution_count": null,
2929
"metadata": {
3030
"execution": {
3131
"iopub.execute_input": "2025-11-12T14:11:59.848913Z",
@@ -66,7 +66,7 @@
6666
"\n",
6767
" print(f\"PyGeM version: {pygem.__version__}\")\n",
6868
"except ImportError:\n",
69-
" print(f\"PyGeM not found. Installing...\")\n",
69+
" print(\"PyGeM not found. Installing...\")\n",
7070
" import subprocess\n",
7171
"\n",
7272
" subprocess.check_call(\n",

tutorials/tutorial2/tutorial-2-iges.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
print(f"PyGeM version: {pygem.__version__}")
1919
except ImportError:
20-
print(f"PyGeM not found. Installing...")
20+
print("PyGeM not found. Installing...")
2121
import subprocess
2222

2323
subprocess.check_call(

tutorials/tutorial3/tutorial-3-rbf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
print(f"PyGeM version: {pygem.__version__}")
2424
except ImportError:
25-
print(f"PyGeM not found. Installing...")
25+
print("PyGeM not found. Installing...")
2626
import subprocess
2727

2828
subprocess.check_call(

tutorials/tutorial4/tutorial-4-idw.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
{
2121
"cell_type": "code",
22-
"execution_count": 1,
22+
"execution_count": null,
2323
"metadata": {
2424
"execution": {
2525
"iopub.execute_input": "2025-11-11T16:25:50.214302Z",
@@ -59,7 +59,7 @@
5959
"\n",
6060
" print(f\"PyGeM version: {pygem.__version__}\")\n",
6161
"except ImportError:\n",
62-
" print(f\"PyGeM not found. Installing...\")\n",
62+
" print(\"PyGeM not found. Installing...\")\n",
6363
" import subprocess\n",
6464
"\n",
6565
" subprocess.check_call(\n",

tutorials/tutorial4/tutorial-4-idw.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
print(f"PyGeM version: {pygem.__version__}")
2424
except ImportError:
25-
print(f"PyGeM not found. Installing...")
25+
print("PyGeM not found. Installing...")
2626
import subprocess
2727

2828
subprocess.check_call(

tutorials/tutorial5/tutorial-5-file.ipynb

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
{
2020
"cell_type": "code",
21-
"execution_count": 1,
21+
"execution_count": null,
2222
"metadata": {
2323
"execution": {
2424
"iopub.execute_input": "2025-11-12T15:15:10.420287Z",
@@ -60,7 +60,7 @@
6060
" import pygem\n",
6161
" print(f\"PyGeM version: {pygem.__version__}\")\n",
6262
"except ImportError:\n",
63-
" print(f\"PyGeM not found. Installing...\")\n",
63+
" print(\"PyGeM not found. Installing...\")\n",
6464
" # Installing from local source. It can be replaced with github installation once pushed and merged.\n",
6565
" subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", \"-e\", \".[tut]\"])\n",
6666
" import pygem\n",
@@ -174,8 +174,8 @@
174174
"Length: 2498 (2.4K) [text/plain]\r\n",
175175
"Saving to: ‘cube.vtp’\r\n",
176176
"\r\n",
177-
"\r",
178-
"cube.vtp 0%[ ] 0 --.-KB/s \r",
177+
"\r\n",
178+
"cube.vtp 0%[ ] 0 --.-KB/s \r\n",
179179
"cube.vtp 100%[===================>] 2.44K --.-KB/s in 0s \r\n",
180180
"\r\n",
181181
"2025-11-12 16:15:11 (82.5 MB/s) - ‘cube.vtp’ saved [2498/2498]\r\n",
@@ -278,7 +278,9 @@
278278
"<Figure size 1600x1000 with 1 Axes>"
279279
]
280280
},
281-
"metadata": {},
281+
"metadata": {
282+
"needs_background": "light"
283+
},
282284
"output_type": "display_data"
283285
}
284286
],
@@ -361,8 +363,8 @@
361363
"Length: 1509 (1.5K) [text/plain]\r\n",
362364
"Saving to: ‘cube.stl’\r\n",
363365
"\r\n",
364-
"\r",
365-
"cube.stl 0%[ ] 0 --.-KB/s \r",
366+
"\r\n",
367+
"cube.stl 0%[ ] 0 --.-KB/s \r\n",
366368
"cube.stl 100%[===================>] 1.47K --.-KB/s in 0s \r\n",
367369
"\r\n",
368370
"2025-11-12 16:15:12 (49.0 MB/s) - ‘cube.stl’ saved [1509/1509]\r\n",
@@ -406,7 +408,9 @@
406408
"<Figure size 1600x1000 with 1 Axes>"
407409
]
408410
},
409-
"metadata": {},
411+
"metadata": {
412+
"needs_background": "light"
413+
},
410414
"output_type": "display_data"
411415
},
412416
{
@@ -416,7 +420,9 @@
416420
"<Figure size 1600x1000 with 1 Axes>"
417421
]
418422
},
419-
"metadata": {},
423+
"metadata": {
424+
"needs_background": "light"
425+
},
420426
"output_type": "display_data"
421427
}
422428
],

0 commit comments

Comments
 (0)