From e20b5c764c77ea1a8be4306d6daf6bde1c4829aa Mon Sep 17 00:00:00 2001 From: Adnan-Ali-Ahmad Date: Fri, 9 Jun 2023 14:19:22 +0200 Subject: [PATCH 1/3] fixing pint import error --- src/osyris/core/array.py | 2 +- src/osyris/core/vector.py | 2 +- src/osyris/plot/histogram2d.py | 2 +- src/osyris/plot/map.py | 2 +- src/osyris/plot/scatter.py | 2 +- src/osyris/plot/wrappers.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/osyris/core/array.py b/src/osyris/core/array.py index ae744b98..a0158d03 100644 --- a/src/osyris/core/array.py +++ b/src/osyris/core/array.py @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2022 Osyris contributors (https://github.com/osyris-project/osyris) import numpy as np -from pint.quantity import Quantity +from pint import Quantity from pint.errors import DimensionalityError from .base import Base from .tools import value_to_string diff --git a/src/osyris/core/vector.py b/src/osyris/core/vector.py index 92510470..9a20fc64 100644 --- a/src/osyris/core/vector.py +++ b/src/osyris/core/vector.py @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2022 Osyris contributors (https://github.com/osyris-project/osyris) import numpy as np -from pint.quantity import Quantity +from pint import Quantity from .base import Base from .array import Array from .tools import value_to_string diff --git a/src/osyris/plot/histogram2d.py b/src/osyris/plot/histogram2d.py index 9afa5507..982177ed 100644 --- a/src/osyris/plot/histogram2d.py +++ b/src/osyris/plot/histogram2d.py @@ -2,7 +2,7 @@ # Copyright (c) 2022 Osyris contributors (https://github.com/osyris-project/osyris) import numpy as np -from pint.quantity import Quantity +from pint import Quantity from typing import Union from ..core import Array, Plot from .render import render diff --git a/src/osyris/plot/map.py b/src/osyris/plot/map.py index 51e4ad60..16879989 100644 --- a/src/osyris/plot/map.py +++ b/src/osyris/plot/map.py @@ -3,7 +3,7 @@ import numpy as np import numpy.ma as ma -from pint.quantity import Quantity +from pint import Quantity from typing import Union from .direction import get_direction from .render import render diff --git a/src/osyris/plot/scatter.py b/src/osyris/plot/scatter.py index 856486b0..0164e95c 100644 --- a/src/osyris/plot/scatter.py +++ b/src/osyris/plot/scatter.py @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2022 Osyris contributors (https://github.com/osyris-project/osyris) -from pint.quantity import Quantity +from pint import Quantity from ..core import Plot, Array from .. import units from .render import render diff --git a/src/osyris/plot/wrappers.py b/src/osyris/plot/wrappers.py index 0266ac53..3a5b21ae 100644 --- a/src/osyris/plot/wrappers.py +++ b/src/osyris/plot/wrappers.py @@ -8,7 +8,7 @@ from matplotlib.cm import ScalarMappable from matplotlib.collections import PatchCollection import numpy as np -from pint.quantity import Quantity +from pint import Quantity def _add_colorbar(obj, ax, cax=None, label=None): From f29db5e309dced82d27ca0cc89ce016af9aa298f Mon Sep 17 00:00:00 2001 From: Adnan-Ali-Ahmad Date: Fri, 9 Jun 2023 14:31:28 +0200 Subject: [PATCH 2/3] remove deprecated numpy attribute --- src/osyris/plot/wrappers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osyris/plot/wrappers.py b/src/osyris/plot/wrappers.py index 3a5b21ae..761f3f3c 100644 --- a/src/osyris/plot/wrappers.py +++ b/src/osyris/plot/wrappers.py @@ -41,7 +41,7 @@ def quiver(ax, default_args = {"angles": "xy", "pivot": "mid", "zorder": zorder} default_args.update(kwargs) - skips = np.around(np.array(z.shape) * 4.0 / 128.0 / density).astype(np.int) + skips = np.around(np.array(z.shape) * 4.0 / 128.0 / density).astype(np.int_) skip = (slice(None, None, skips[0]), slice(None, None, skips[1])) args = [x[skip[0]], y[skip[1]], z[..., 0][skip], z[..., 1][skip]] From b01bd0ea57f845688d1c92ebb7e7f5e0619d40ee Mon Sep 17 00:00:00 2001 From: Adnan-Ali-Ahmad <60321972+Adnan-Ali-Ahmad@users.noreply.github.com> Date: Fri, 9 Jun 2023 17:37:23 +0200 Subject: [PATCH 3/3] Update src/osyris/plot/wrappers.py Co-authored-by: Neil Vaytet <39047984+nvaytet@users.noreply.github.com> --- src/osyris/plot/wrappers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osyris/plot/wrappers.py b/src/osyris/plot/wrappers.py index 761f3f3c..007aa8f9 100644 --- a/src/osyris/plot/wrappers.py +++ b/src/osyris/plot/wrappers.py @@ -41,7 +41,7 @@ def quiver(ax, default_args = {"angles": "xy", "pivot": "mid", "zorder": zorder} default_args.update(kwargs) - skips = np.around(np.array(z.shape) * 4.0 / 128.0 / density).astype(np.int_) + skips = np.around(np.array(z.shape) * 4.0 / 128.0 / density).astype(int) skip = (slice(None, None, skips[0]), slice(None, None, skips[1])) args = [x[skip[0]], y[skip[1]], z[..., 0][skip], z[..., 1][skip]]