Merge pull request #879 from atmos-cloud-sim-uj/slayoo-patch-19

SciPy deprecation fixes

Author: slayoo

.github/workflows/tests+pypi.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest, macos-12, windows-latest]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9"]
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2

PySDM/exporters/netcdf_exporter.py

@@ -2,7 +2,7 @@
  [SciPy.io.netcdf_file](https://docs.scipy.org/doc/scipy/reference/tutorial/io.html#netcdf)
 """
 import numpy as np
-from scipy.io.netcdf import netcdf_file
+from scipy.io import netcdf_file
 
 from PySDM.products.impl.spectrum_moment_product import SpectrumMomentProduct
 

PySDM/exporters/netcdf_exporter_1d.py

@@ -6,7 +6,7 @@
 from copy import deepcopy
 
 import numpy as np
-from scipy.io.netcdf import netcdf_file
+from scipy.io import netcdf_file
 
 
 class NetCDFExporter_1d:

setup.py

@@ -26,7 +26,7 @@ def get_long_description():
         "numpy" + ("==1.21.6" if "CI" in os.environ else ""),
         "Pint" + ("==0.17" if "CI" in os.environ else ""),
         "chempy" + ("==0.7.10" if "CI" in os.environ else ""),
-        "scipy" + ("==1.6.3" if "CI" in os.environ else ""),
+        "scipy" + ("==1.7.3" if "CI" in os.environ else ""),
         "pyevtk" + ("==1.2.0" if "CI" in os.environ else ""),
     ],
     author="https://github.com/atmos-cloud-sim-uj/PySDM/graphs/contributors",

tests/smoke_tests/shipway_and_hill_2012/test_few_steps.py

@@ -3,7 +3,7 @@
 import pytest
 from matplotlib import pyplot
 from PySDM_examples.Shipway_and_Hill_2012 import Settings, Simulation
-from scipy.ndimage.filters import uniform_filter1d
+from scipy.ndimage import uniform_filter1d
 
 from PySDM.physics import si
 

tests/unit_tests/backends/test_toms748.py

@@ -4,7 +4,7 @@
 import numba
 import numpy as np
 import pytest
-from scipy.optimize.zeros import toms748
+from scipy.optimize import toms748
 
 from PySDM.backends.impl_numba.toms748 import toms748_solve
 from PySDM.formulae import Formulae