PySDM 2.97__tar.gz → 2.98__tar.gz

{pysdm-2.97 → pysdm-2.98}/.zenodo.json

@@ -35,7 +35,7 @@
       "orcid": "0000-0003-2272-8548"
     },
     {
-      "affiliation": "Columbia University, NY, USA",
+      "affiliation": "Columbia University, New York, NY, USA",
       "name": "Buch, Jatan",
       "orcid": "0000-0001-6672-6750"
     },
@@ -70,7 +70,7 @@
       "name": "Konstantinov, Boris"
     },
     {
-      "affiliation": "Columbia University, NY, USA",
+      "affiliation": "Columbia University, New York, NY, USA",
       "name": "Loftus, Kaitlyn",
       "orcid": "0000-0002-1927-9326"
     },
@@ -119,7 +119,7 @@
       "name": "Romaniec, Weronika"
     },
     {
-      "affiliation": "NOAA GFDL, NJ, USA (2024-); Columbia University, NY, USA (2023-2024); California Institute of Technology, Pasadena, CA, USA (-2023)",
+      "affiliation": "NOAA GFDL, Princeton, NJ, USA (2024-); Columbia University, New York, NY, USA (2023-2024); California Institute of Technology, Pasadena, CA, USA (2018-2023)",
       "name": "Singer, Clare E.",
       "orcid": "0000-0002-1708-0997"
     },

{pysdm-2.97 → pysdm-2.98}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.97
+Version: 2.98
 Summary: Pythonic particle-based (super-droplet) warm-rain/aqueous-chemistry cloud microphysics package with box, parcel & 1D/2D prescribed-flow examples in Python, Julia and Matlab
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors
@@ -34,6 +34,8 @@ Provides-Extra: tests
 Requires-Dist: matplotlib; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-timeout; extra == "tests"
+Requires-Dist: PySDM-examples; extra == "tests"
+Requires-Dist: open-atmos-jupyter-utils>=v1.2.0; extra == "tests"
 Requires-Dist: pyrcel; extra == "tests"
 Requires-Dist: jupyter-core<5.0.0; extra == "tests"
 Requires-Dist: ipywidgets!=8.0.3; extra == "tests"

{pysdm-2.97 → pysdm-2.98}/PySDM.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.97
+Version: 2.98
 Summary: Pythonic particle-based (super-droplet) warm-rain/aqueous-chemistry cloud microphysics package with box, parcel & 1D/2D prescribed-flow examples in Python, Julia and Matlab
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors
@@ -34,6 +34,8 @@ Provides-Extra: tests
 Requires-Dist: matplotlib; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-timeout; extra == "tests"
+Requires-Dist: PySDM-examples; extra == "tests"
+Requires-Dist: open-atmos-jupyter-utils>=v1.2.0; extra == "tests"
 Requires-Dist: pyrcel; extra == "tests"
 Requires-Dist: jupyter-core<5.0.0; extra == "tests"
 Requires-Dist: ipywidgets!=8.0.3; extra == "tests"

{pysdm-2.97 → pysdm-2.98}/PySDM.egg-info/SOURCES.txt

@@ -649,7 +649,6 @@ examples/PySDM_examples/seeding/simulation.py
 examples/PySDM_examples/utils/__init__.py
 examples/PySDM_examples/utils/basic_simulation.py
 examples/PySDM_examples/utils/dummy_controller.py
-examples/PySDM_examples/utils/notebook_vars.py
 examples/PySDM_examples/utils/progbar_controller.py
 examples/PySDM_examples/utils/read_vtk_1d.py
 examples/PySDM_examples/utils/widgets/__init__.py

{pysdm-2.97 → pysdm-2.98}/PySDM.egg-info/requires.txt

@@ -11,6 +11,8 @@ pyevtk
 matplotlib
 pytest
 pytest-timeout
+PySDM-examples
+open-atmos-jupyter-utils>=v1.2.0
 pyrcel
 jupyter-core<5.0.0
 ipywidgets!=8.0.3

{pysdm-2.97 → pysdm-2.98}/examples/PySDM_examples/utils/__init__.py

@@ -4,6 +4,5 @@ reusable commons for examples
 
 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

{pysdm-2.97 → pysdm-2.98}/setup.py

@@ -77,6 +77,8 @@ setup(
             "matplotlib",
             "pytest",
             "pytest-timeout",
+            "PySDM-examples",
+            "open-atmos-jupyter-utils>=v1.2.0",
         ]
         + (["PyPartMC==1.3.6"] if sys.version_info < (3, 12) else [])  # TODO #1410
         + (

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/box/dejong_azimi/test_box.py

@@ -5,7 +5,7 @@ from pathlib import Path
 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

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/no_env/bolin_1958/test_table_1.py

@@ -6,7 +6,7 @@ from pathlib import Path
 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
 
 

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/no_env/gedzelman_and_arnold_1994/test_fig_2.py

@@ -7,7 +7,7 @@ from pathlib import Path
 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

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/no_env/lamb_et_al_2017/test_fig_4.py

@@ -7,7 +7,7 @@ from pathlib import Path
 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

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/no_env/miyake_et_al_1968/test_fig_19.py

@@ -7,7 +7,7 @@ from pathlib import Path
 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

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/no_env/pierchala_et_al_2022/test_fig_3.py

@@ -7,7 +7,7 @@ from pathlib import Path
 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

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/no_env/pierchala_et_al_2022/test_fig_4.py

@@ -7,7 +7,7 @@ from pathlib import Path
 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

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/parcel_a/lowe_et_al_2019/test_fig_s2.py

@@ -10,7 +10,7 @@ from pathlib import Path
 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
 

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/parcel_c/abade_and_albuquerque_2024/test_fig_2.py

@@ -7,7 +7,7 @@ from pathlib import Path
 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

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/parcel_c/graf_et_al_2019/test_fig_4.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 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

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/parcel_c/graf_et_al_2019/test_table_1.py

@@ -5,7 +5,7 @@ from pathlib import Path
 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

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_1.py

@@ -6,7 +6,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 import si

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_3_and_tab_4_upper_rows.py

@@ -6,7 +6,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
 

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_4_and_7_and_tab_4_bottom_rows.py

@@ -3,7 +3,7 @@ from pathlib import Path
 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

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_5.py

@@ -6,7 +6,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

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/parcel_d/jensen_and_nugent_2017/test_fig_6.py

@@ -6,7 +6,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

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/parcel_d/rozanski_and_sonntag_1982/test_figs_4_5_6.py

@@ -5,7 +5,7 @@ from pathlib import Path
 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
 

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/parcel_d/seeding/test_hello_world.py

@@ -5,7 +5,7 @@ from pathlib import Path
 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

{pysdm-2.97 → pysdm-2.98}/tests/smoke_tests/parcel_d/seeding/test_seeding_no_collisions.py

@@ -5,7 +5,7 @@ from pathlib import Path
 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

pysdm-2.97/examples/PySDM_examples/utils/notebook_vars.py

@@ -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