From 91c503d5f9b22b773ed8dfe7e93174838cc2411d Mon Sep 17 00:00:00 2001 From: Antoine Beyeler Date: Tue, 19 Apr 2022 15:43:00 +0200 Subject: [PATCH 1/2] Fixed warning due to deprecated `np.asscalar()` Numpy function --- pnoise/pnoise.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pnoise/pnoise.py b/pnoise/pnoise.py index b59a0d3..dc7ed22 100644 --- a/pnoise/pnoise.py +++ b/pnoise/pnoise.py @@ -1,7 +1,7 @@ """pnoise library""" """ Ported from the Processing project - http://processing.org -Copyright (c) 2021 Antoine Beyeler +Copyright (c) 2021-2022 Antoine Beyeler Copyright (c) 2012-15 The Processing Foundation Copyright (c) 2004-12 Ben Fry and Casey Reas Copyright (c) 2001-04 Massachusetts Institute of Technology @@ -109,7 +109,7 @@ def perlin( grid[idx] -= 1.0 if single: - return np.asscalar(r) + return np.item(r) elif not grid_mode: return r else: From af892403f852e73c0e2f83dc24b2e07fb71c58d8 Mon Sep 17 00:00:00 2001 From: Antoine Beyeler Date: Tue, 19 Apr 2022 15:53:42 +0200 Subject: [PATCH 2/2] - Fixed mypy - Fixed bad use of item() --- pnoise/__init__.py | 2 +- pnoise/pnoise.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pnoise/__init__.py b/pnoise/__init__.py index 701eeca..7ce52a0 100644 --- a/pnoise/__init__.py +++ b/pnoise/__init__.py @@ -5,7 +5,7 @@ def _get_version() -> str: try: from importlib.metadata import version except ModuleNotFoundError: - from importlib_metadata import version + from importlib_metadata import version # type: ignore return version(__name__) diff --git a/pnoise/pnoise.py b/pnoise/pnoise.py index dc7ed22..80b7d6f 100644 --- a/pnoise/pnoise.py +++ b/pnoise/pnoise.py @@ -51,7 +51,7 @@ def perlin( y: Union[Number, Sequence[Number]], z: Union[Number, Sequence[Number]], grid_mode: bool = True, - ) -> np.ndarray: + ) -> Union[np.ndarray, float]: """Compute perlin noise for a range of values. Each of the x, y, and z argument may be 1D sequence of float. Perlin noise will be @@ -65,7 +65,10 @@ def perlin( if not grid_mode or single: grid = np.array([x, y, z], dtype=float) else: - grid = np.array(np.meshgrid(x, y, z, indexing="ij", copy=False), dtype=float) + grid = np.array( + np.meshgrid(np.array(x), np.array(y), np.array(z), indexing="ij", copy=False), + dtype=float, + ) np.abs(grid, out=grid) grid_i = grid.astype(int) @@ -109,7 +112,7 @@ def perlin( grid[idx] -= 1.0 if single: - return np.item(r) + return float(r.item()) elif not grid_mode: return r else: