From 7eac8aae0d2601806c8c35dcc1ebaa7f6237b24c Mon Sep 17 00:00:00 2001 From: AgnieszkaZaba <56157996+AgnieszkaZaba@users.noreply.github.com> Date: Wed, 22 Jan 2025 07:43:29 +0100 Subject: [PATCH] delete notebook_vars.py from PySDM_examples.utils (#1505) Co-authored-by: Sylwester Arabas --- examples/PySDM_examples/utils/__init__.py | 1 - .../PySDM_examples/utils/notebook_vars.py | 31 ------------------- .../smoke_tests/box/dejong_azimi/test_box.py | 2 +- .../no_env/bolin_1958/test_table_1.py | 2 +- .../gedzelman_and_arnold_1994/test_fig_2.py | 2 +- .../no_env/lamb_et_al_2017/test_fig_4.py | 2 +- .../no_env/miyake_et_al_1968/test_fig_19.py | 2 +- .../no_env/pierchala_et_al_2022/test_fig_3.py | 2 +- .../no_env/pierchala_et_al_2022/test_fig_4.py | 2 +- .../parcel_a/lowe_et_al_2019/test_fig_s2.py | 2 +- .../abade_and_albuquerque_2024/test_fig_2.py | 2 +- .../parcel_c/graf_et_al_2019/test_fig_4.py | 2 +- .../parcel_c/graf_et_al_2019/test_table_1.py | 2 +- .../jensen_and_nugent_2017/test_fig_1.py | 2 +- .../test_fig_3_and_tab_4_upper_rows.py | 2 +- .../test_fig_4_and_7_and_tab_4_bottom_rows.py | 2 +- .../jensen_and_nugent_2017/test_fig_5.py | 2 +- .../jensen_and_nugent_2017/test_fig_6.py | 2 +- .../test_figs_4_5_6.py | 2 +- .../parcel_d/seeding/test_hello_world.py | 2 +- .../seeding/test_seeding_no_collisions.py | 2 +- 21 files changed, 19 insertions(+), 51 deletions(-) delete mode 100644 examples/PySDM_examples/utils/notebook_vars.py diff --git a/examples/PySDM_examples/utils/__init__.py b/examples/PySDM_examples/utils/__init__.py index 388dd1d41..b66040d1b 100644 --- a/examples/PySDM_examples/utils/__init__.py +++ b/examples/PySDM_examples/utils/__init__.py @@ -4,6 +4,5 @@ from .basic_simulation import BasicSimulation from .dummy_controller import DummyController -from .notebook_vars import notebook_vars from .progbar_controller import ProgBarController from .read_vtk_1d import readVTK_1d diff --git a/examples/PySDM_examples/utils/notebook_vars.py b/examples/PySDM_examples/utils/notebook_vars.py deleted file mode 100644 index a51caecb5..000000000 --- a/examples/PySDM_examples/utils/notebook_vars.py +++ /dev/null @@ -1,31 +0,0 @@ -""" helper routines for use in smoke tests """ - -from pathlib import Path - -import nbformat - - -def notebook_vars(file: Path, plot: bool): - """Executes the code from all cells of the Jupyter notebook `file` and - returns a dictionary with the notebook variables. If the `plot` argument - is set to `True`, any code line within the notebook starting with `show_plot(` - (see [open_atmos_jupyter_utils docs](https://pypi.org/p/open_atmos_jupyter_utils)) - is replaced with `pyplot.show() #`, otherwise it is replaced with `pyplot.gca().clear() #` - to match the smoke-test conventions.""" - notebook = nbformat.read(file, nbformat.NO_CONVERT) - context = {} - for cell in notebook.cells: - if cell.cell_type != "markdown": - lines = cell.source.splitlines() - for i, line in enumerate(lines): - if line.strip().startswith("!"): - lines[i] = line.replace("!", "pass #") - if line.strip().startswith("show_plot("): - lines[i] = line.replace( - "show_plot(", - "from matplotlib import pyplot; " - + ("pyplot.show() #" if plot else "pyplot.gca().clear() #"), - ) - - exec("\n".join(lines), context) # pylint: disable=exec-used - return context diff --git a/tests/smoke_tests/box/dejong_azimi/test_box.py b/tests/smoke_tests/box/dejong_azimi/test_box.py index b7c8368f6..cf8abd505 100644 --- a/tests/smoke_tests/box/dejong_azimi/test_box.py +++ b/tests/smoke_tests/box/dejong_azimi/test_box.py @@ -5,7 +5,7 @@ import pytest import numpy as np -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import deJong_Azimi from PySDM.physics import si, in_unit diff --git a/tests/smoke_tests/no_env/bolin_1958/test_table_1.py b/tests/smoke_tests/no_env/bolin_1958/test_table_1.py index 1ed62a950..c376d498e 100644 --- a/tests/smoke_tests/no_env/bolin_1958/test_table_1.py +++ b/tests/smoke_tests/no_env/bolin_1958/test_table_1.py @@ -6,7 +6,7 @@ from collections import defaultdict import numpy as np import pytest -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Bolin_1958 diff --git a/tests/smoke_tests/no_env/gedzelman_and_arnold_1994/test_fig_2.py b/tests/smoke_tests/no_env/gedzelman_and_arnold_1994/test_fig_2.py index 3d87c578f..1d2f68652 100644 --- a/tests/smoke_tests/no_env/gedzelman_and_arnold_1994/test_fig_2.py +++ b/tests/smoke_tests/no_env/gedzelman_and_arnold_1994/test_fig_2.py @@ -7,7 +7,7 @@ import numpy as np import pytest -from PySDM_examples.utils.notebook_vars import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Gedzelman_and_Arnold_1994 PLOT = False diff --git a/tests/smoke_tests/no_env/lamb_et_al_2017/test_fig_4.py b/tests/smoke_tests/no_env/lamb_et_al_2017/test_fig_4.py index e749380cf..17bd478c1 100644 --- a/tests/smoke_tests/no_env/lamb_et_al_2017/test_fig_4.py +++ b/tests/smoke_tests/no_env/lamb_et_al_2017/test_fig_4.py @@ -7,7 +7,7 @@ import numpy as np import pytest -from PySDM_examples.utils.notebook_vars import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Lamb_et_al_2017 PLOT = False diff --git a/tests/smoke_tests/no_env/miyake_et_al_1968/test_fig_19.py b/tests/smoke_tests/no_env/miyake_et_al_1968/test_fig_19.py index 4181360ec..0c87e9e85 100644 --- a/tests/smoke_tests/no_env/miyake_et_al_1968/test_fig_19.py +++ b/tests/smoke_tests/no_env/miyake_et_al_1968/test_fig_19.py @@ -7,7 +7,7 @@ import numpy as np import pytest -from PySDM_examples.utils.notebook_vars import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Miyake_et_al_1968 PLOT = False diff --git a/tests/smoke_tests/no_env/pierchala_et_al_2022/test_fig_3.py b/tests/smoke_tests/no_env/pierchala_et_al_2022/test_fig_3.py index 158dc7285..3f6357f2b 100644 --- a/tests/smoke_tests/no_env/pierchala_et_al_2022/test_fig_3.py +++ b/tests/smoke_tests/no_env/pierchala_et_al_2022/test_fig_3.py @@ -7,7 +7,7 @@ import numpy as np import pytest -from PySDM_examples.utils.notebook_vars import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Pierchala_et_al_2022 from PySDM.physics.constants import PER_MEG, PER_MILLE diff --git a/tests/smoke_tests/no_env/pierchala_et_al_2022/test_fig_4.py b/tests/smoke_tests/no_env/pierchala_et_al_2022/test_fig_4.py index 7a5d17d33..a26da764d 100644 --- a/tests/smoke_tests/no_env/pierchala_et_al_2022/test_fig_4.py +++ b/tests/smoke_tests/no_env/pierchala_et_al_2022/test_fig_4.py @@ -7,7 +7,7 @@ import numpy as np import pytest -from PySDM_examples.utils.notebook_vars import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Pierchala_et_al_2022 from PySDM.physics.constants import PER_MEG, PER_MILLE diff --git a/tests/smoke_tests/parcel_a/lowe_et_al_2019/test_fig_s2.py b/tests/smoke_tests/parcel_a/lowe_et_al_2019/test_fig_s2.py index 8d8e19650..9c36bcc9f 100644 --- a/tests/smoke_tests/parcel_a/lowe_et_al_2019/test_fig_s2.py +++ b/tests/smoke_tests/parcel_a/lowe_et_al_2019/test_fig_s2.py @@ -10,7 +10,7 @@ import numpy as np import pytest from PySDM_examples import Lowe_et_al_2019 -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM.physics import si diff --git a/tests/smoke_tests/parcel_c/abade_and_albuquerque_2024/test_fig_2.py b/tests/smoke_tests/parcel_c/abade_and_albuquerque_2024/test_fig_2.py index d98383ad1..05d43097b 100644 --- a/tests/smoke_tests/parcel_c/abade_and_albuquerque_2024/test_fig_2.py +++ b/tests/smoke_tests/parcel_c/abade_and_albuquerque_2024/test_fig_2.py @@ -7,7 +7,7 @@ import numpy as np import pytest -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Abade_and_Albuquerque_2024 from PySDM.physics import si diff --git a/tests/smoke_tests/parcel_c/graf_et_al_2019/test_fig_4.py b/tests/smoke_tests/parcel_c/graf_et_al_2019/test_fig_4.py index c4d9eedd1..4dea4c3d7 100644 --- a/tests/smoke_tests/parcel_c/graf_et_al_2019/test_fig_4.py +++ b/tests/smoke_tests/parcel_c/graf_et_al_2019/test_fig_4.py @@ -4,7 +4,7 @@ import pytest -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Graf_et_al_2019 from PySDM.physics import si diff --git a/tests/smoke_tests/parcel_c/graf_et_al_2019/test_table_1.py b/tests/smoke_tests/parcel_c/graf_et_al_2019/test_table_1.py index 16729fd72..aa066a6db 100644 --- a/tests/smoke_tests/parcel_c/graf_et_al_2019/test_table_1.py +++ b/tests/smoke_tests/parcel_c/graf_et_al_2019/test_table_1.py @@ -5,7 +5,7 @@ import numpy as np import pytest -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Graf_et_al_2019 from PySDM.physics.constants import PER_MILLE diff --git a/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_1.py b/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_1.py index b6a5909c3..0081336f4 100644 --- a/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_1.py +++ b/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_1.py @@ -6,7 +6,7 @@ import pytest from scipy import signal -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Jensen_and_Nugent_2017 from PySDM.physics import si diff --git a/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_3_and_tab_4_upper_rows.py b/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_3_and_tab_4_upper_rows.py index 480487e71..563801992 100644 --- a/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_3_and_tab_4_upper_rows.py +++ b/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_3_and_tab_4_upper_rows.py @@ -6,7 +6,7 @@ import pytest from scipy import signal -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Jensen_and_Nugent_2017 from PySDM.physics.constants import PER_CENT diff --git a/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_4_and_7_and_tab_4_bottom_rows.py b/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_4_and_7_and_tab_4_bottom_rows.py index 9799e3ead..42f23eba4 100644 --- a/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_4_and_7_and_tab_4_bottom_rows.py +++ b/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_4_and_7_and_tab_4_bottom_rows.py @@ -3,7 +3,7 @@ import numpy as np import pytest from scipy import signal -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Jensen_and_Nugent_2017 from PySDM.physics.constants import PER_CENT from PySDM.physics import si diff --git a/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_5.py b/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_5.py index a2b8bccfb..eeba97aa4 100644 --- a/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_5.py +++ b/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_5.py @@ -6,7 +6,7 @@ import pytest from scipy import signal -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Jensen_and_Nugent_2017 from PySDM.physics.constants import PER_CENT from PySDM.physics import si diff --git a/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_6.py b/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_6.py index 2a0445ecc..5aec61a1c 100644 --- a/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_6.py +++ b/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_6.py @@ -6,7 +6,7 @@ import pytest from scipy import signal -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Jensen_and_Nugent_2017 from PySDM.physics.constants import PER_CENT from PySDM.physics import si diff --git a/tests/smoke_tests/parcel_d/rozanski_and_sonntag_1982/test_figs_4_5_6.py b/tests/smoke_tests/parcel_d/rozanski_and_sonntag_1982/test_figs_4_5_6.py index 5ba339b34..d0d0fc8d8 100644 --- a/tests/smoke_tests/parcel_d/rozanski_and_sonntag_1982/test_figs_4_5_6.py +++ b/tests/smoke_tests/parcel_d/rozanski_and_sonntag_1982/test_figs_4_5_6.py @@ -5,7 +5,7 @@ import numpy as np import pytest -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import Rozanski_and_Sonntag_1982 from PySDM.physics import in_unit diff --git a/tests/smoke_tests/parcel_d/seeding/test_hello_world.py b/tests/smoke_tests/parcel_d/seeding/test_hello_world.py index 607490eed..abdfd7bcd 100644 --- a/tests/smoke_tests/parcel_d/seeding/test_hello_world.py +++ b/tests/smoke_tests/parcel_d/seeding/test_hello_world.py @@ -5,7 +5,7 @@ import numpy as np import pytest -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import seeding PLOT = False diff --git a/tests/smoke_tests/parcel_d/seeding/test_seeding_no_collisions.py b/tests/smoke_tests/parcel_d/seeding/test_seeding_no_collisions.py index 436a933db..a0d62782d 100644 --- a/tests/smoke_tests/parcel_d/seeding/test_seeding_no_collisions.py +++ b/tests/smoke_tests/parcel_d/seeding/test_seeding_no_collisions.py @@ -5,7 +5,7 @@ import numpy as np import pytest -from PySDM_examples.utils import notebook_vars +from open_atmos_jupyter_utils import notebook_vars from PySDM_examples import seeding PLOT = False