From 811b52edeafbbac0b7b31f2f07d459a8f686bbdb Mon Sep 17 00:00:00 2001 From: Bill Little Date: Mon, 18 Dec 2023 12:36:01 +0000 Subject: [PATCH] ruff NPY rule compliance --- .ruff.toml | 4 ---- lib/iris/fileformats/pp.py | 2 +- lib/iris/tests/integration/netcdf/test_delayed_save.py | 2 +- lib/iris/tests/integration/test_regridding.py | 5 +++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.ruff.toml b/.ruff.toml index 7ee7f985aff..f8996799e33 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -238,10 +238,6 @@ lint.ignore = [ # https://docs.astral.sh/ruff/rules/#flynt-fly "FLY", - # NumPy-specific rules (NPY) - # https://docs.astral.sh/ruff/rules/#numpy-specific-rules-npy - "NPY", - # Airflow (AIR) # https://docs.astral.sh/ruff/rules/#airflow-air "AIR", diff --git a/lib/iris/fileformats/pp.py b/lib/iris/fileformats/pp.py index f6eb3d7168e..042ba6f2bc4 100644 --- a/lib/iris/fileformats/pp.py +++ b/lib/iris/fileformats/pp.py @@ -1217,7 +1217,7 @@ def save(self, file_handle): ia //= PP_WORD_DEPTH else: # ia is the datalength in WORDS - ia = np.product(extra_elem.shape) + ia = np.prod(extra_elem.shape) # flip the byteorder if the data is not big-endian if extra_elem.dtype.newbyteorder(">") != extra_elem.dtype: # take a copy of the extra data when byte swapping diff --git a/lib/iris/tests/integration/netcdf/test_delayed_save.py b/lib/iris/tests/integration/netcdf/test_delayed_save.py index 06d04e957d4..d76d57c3e17 100644 --- a/lib/iris/tests/integration/netcdf/test_delayed_save.py +++ b/lib/iris/tests/integration/netcdf/test_delayed_save.py @@ -69,7 +69,7 @@ def fix_array(array): dmin, dmax = 0, 255 else: dmin, dmax = array.min(), array.max() - array = np.random.uniform(dmin, dmax, size=array.shape) + array = np.random.default_rng().uniform(dmin, dmax, size=array.shape) if data_is_maskedbytes: array = array.astype("u1") diff --git a/lib/iris/tests/integration/test_regridding.py b/lib/iris/tests/integration/test_regridding.py index 833c0590532..c8197a9d94b 100644 --- a/lib/iris/tests/integration/test_regridding.py +++ b/lib/iris/tests/integration/test_regridding.py @@ -110,8 +110,9 @@ def test_nearest(self): class TestZonalMean_global(tests.IrisTest): def setUp(self): - np.random.seed(0) - self.src = iris.cube.Cube(np.random.randint(0, 10, size=(140, 1))) + self.src = iris.cube.Cube( + np.random.default_rng().integers(0, 10, size=(140, 1)) + ) s_crs = iris.coord_systems.GeogCS(6371229.0) sy_coord = iris.coords.DimCoord( np.linspace(-90, 90, 140),