Merge branch 'main' into dependabot/pip/examples/pillow-lt-12.1.0

Author: slayoo

.github/workflows/readme_snippets.yml

@@ -16,7 +16,7 @@ jobs:
   python:
     strategy:
       matrix:
-        platform: [ubuntu-latest, macos-13, macos-14, windows-latest]
+        platform: [ubuntu-latest, macos-15-intel, macos-14, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v4.1.6
@@ -25,7 +25,6 @@ jobs:
           python-version: "3.10"
       - run: python -m pip install $PIP_INSTALL_ARGS -e .
       - run: python -m pip install $PIP_INSTALL_ARGS pytest-codeblocks pytest
-      - run: python -m pip install $PIP_INSTALL_ARGS "pyparsing<3.0.0"  # https://github.com/matplotlib/matplotlib/issues/25204
       - run: python -m pip install $PIP_INSTALL_ARGS "pillow<11.3.0"  # matplotlib triggers deprecation warnings in 11.3.0
       - run: |
           python -c "import os,pytest_codeblocks; code=pytest_codeblocks.extract_from_file('docs/markdown/pysdm_landing.md'); f=open('readme.py', 'w', encoding='utf-8'); f.write('# coding: utf-8'+os.linesep); f.writelines(block.code for block in code if block.syntax=='Python'); f.close()"

.github/workflows/tests.yml

@@ -25,7 +25,7 @@ jobs:
   env-unit-tests-setup:
     strategy:
       matrix:
-        platform: [ ubuntu-24.04, macos-13, macos-14, windows-latest ]
+        platform: [ ubuntu-24.04, macos-15-intel, macos-14, windows-latest ]
         python-version: [ "3.9", "3.12" ]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -90,7 +90,7 @@ jobs:
     needs: env-unit-tests-setup
     strategy:
       matrix:
-        platform: [ ubuntu-24.04, macos-13, macos-14, windows-latest ]
+        platform: [ ubuntu-24.04, macos-15-intel, macos-14, windows-latest ]
         python-version: [ "3.9", "3.12" ]
     runs-on: ${{ matrix.platform }}
     env:

README.md

@@ -63,7 +63,7 @@ For an overview of PySDM features (and the preferred way to cite PySDM in papers
 - [Bartman et al. 2022](https://doi.org/10.21105/joss.03219) (PySDM v1).
 - [de Jong, Singer et al. 2023](https://doi.org/10.21105/joss.04968) (PySDM v2).
 
-PySDM includes an extension of the SDM scheme to represent collisional breakup described in [de Jong, Mackay et al. 2023](10.5194/gmd-16-4193-2023).   
+PySDM includes an extension of the SDM scheme to represent collisional breakup described in [de Jong, Mackay et al. 2023](https://doi.org/10.5194/gmd-16-4193-2023).   
 For a list of talks and other materials on PySDM as well as a list of published papers featuring PySDM simulations, see the [project wiki](https://github.com/open-atmos/PySDM/wiki).
 
 ## Dependencies and Installation

docs/bibliography.json

@@ -370,6 +370,7 @@
   },
   "https://doi.org/10.5194/gmd-16-4193-2023": {
     "usages": [
+      "README.md",
       "examples/docs/pysdm_examples_landing.md",
       "examples/PySDM_examples/deJong_Mackay_et_al_2023/__init__.py"
     ],

docs/markdown/pysdm_landing.md

@@ -96,7 +96,6 @@ It is a [`Coalescence`](https://open-atmos.github.io/PySDM/PySDM/dynamics/collis
 
 ```Julia
 Pkg.add("Plots")
-Pkg.add("PlotlyJS")
 
 ConstantMultiplicity = pyimport("PySDM.initialisation.sampling.spectral_sampling").ConstantMultiplicity
 Exponential = pyimport("PySDM.initialisation.spectra").Exponential
@@ -229,7 +228,7 @@ In the listing below, its usage is interleaved with plotting logic
 <summary>Julia (click to expand)</summary>
 
 ```Julia
-using Plots; plotlyjs()
+using Plots; gr()
 
 for step = 0:1200:3600
     particulator.run(step - particulator.n_steps)
@@ -381,7 +380,7 @@ and the
 
 ```Julia
 using PyCall
-using Plots; plotlyjs()
+using Plots; gr()
 si = pyimport("PySDM.physics").si
 spectral_sampling = pyimport("PySDM.initialisation.sampling").spectral_sampling
 discretise_multiplicities = pyimport("PySDM.initialisation").discretise_multiplicities

examples/PySDM_examples/__init__.py

@@ -3,9 +3,12 @@
 """
 
 from importlib.metadata import PackageNotFoundError, version
+import PySDM
 
 try:
     __version__ = version(__name__)
 except PackageNotFoundError:
     # package is not installed
     pass
+
+assert PySDM.__version__ == __version__

setup.py

@@ -40,6 +40,7 @@
         else ""
     ),
     "pyevtk",
+    "pyparsing" + ("==3.2.5" if CI else ""),
 ]
 
 optional_dependencies = {

tests/unit_tests/test_formulae.py

@@ -104,7 +104,7 @@ def test_trickier_formula_vectorised(formulae_init_args, temp, v_wet, v_dry, f_o
                 v_dry if isinstance(v_dry, float) else v_dry[i],
                 f_org if isinstance(f_org, float) else f_org[i],
             )
-        np.testing.assert_array_equal(actual, expected)
+        np.testing.assert_allclose(actual, expected, rtol=1e-15)
 
     @staticmethod
     def test_flatten():