Fix Numpy1.25 deprecation

hyperspy/_signals/signal2d.py

@@ -697,13 +697,17 @@ def align2D(
             signal_shifts = shifts
         if expand:
             # Expand to fit all valid data
-            left, right = (
-                int(np.floor(signal_shifts.isig[1].min().data)) if signal_shifts.isig[1].min().data < 0 else 0,
-                int(np.ceil(signal_shifts.isig[1].max().data)) if signal_shifts.isig[1].max().data > 0 else 0,
-            )
+            _min0 = signal_shifts.isig[0].min().data[0]
+            _max0 = signal_shifts.isig[0].max().data[0]
             top, bottom = (
-                int(np.ceil(signal_shifts.isig[0].min().data)) if signal_shifts.isig[0].min().data < 0 else 0,
-                int(np.floor(signal_shifts.isig[0].max().data)) if signal_shifts.isig[0].max().data > 0 else 0,
+                int(np.ceil(_min0)) if _min0 < 0 else 0,
+                int(np.floor(_max0)) if _max0 > 0 else 0,
+            )
+            _min1 = signal_shifts.isig[1].min().data[0]
+            _max1 = signal_shifts.isig[1].max().data[0]
+            left, right = (
+                int(np.floor(_min1)) if _min1 < 0 else 0,
+                int(np.ceil(_max1)) if _max1 > 0 else 0,
             )
             xaxis = self.axes_manager.signal_axes[0]
             yaxis = self.axes_manager.signal_axes[1]
@@ -751,14 +755,18 @@ def align2D(
                                   "Max shift:" + str(max_shift.data) + " shape" + str(self.axes_manager.signal_shape))
 
             # Crop the image to the valid size
+            _min0 = signal_shifts.isig[0].min().data[0]
+            _max0 = signal_shifts.isig[0].max().data[0]
             shifts = -shifts
             bottom, top = (
-                int(np.floor(signal_shifts.isig[0].min().data)) if signal_shifts.isig[0].min().data < 0 else None,
-                int(np.ceil(signal_shifts.isig[0].max().data)) if signal_shifts.isig[0].max().data > 0 else 0,
+                int(np.floor(_min0)) if _min0 < 0 else None,
+                int(np.ceil(_max0)) if _max0 > 0 else 0,
             )
+            _min1 = signal_shifts.isig[1].min().data[0]
+            _max1 = signal_shifts.isig[1].max().data[0]
             right, left = (
-                int(np.floor(signal_shifts.isig[1].min().data)) if signal_shifts.isig[1].min().data < 0 else None,
-                int(np.ceil(signal_shifts.isig[1].max().data)) if signal_shifts.isig[1].max().data > 0 else 0,
+                int(np.floor(_min1)) if _min1 < 0 else None,
+                int(np.ceil(_max1)) if _max1 > 0 else 0,
             )
             self.crop_image(top, bottom, left, right)
             shifts = -shifts

hyperspy/tests/drawing/test_plot_mva.py

@@ -185,11 +185,8 @@ def test_plot_cluster_distances_nav2_sig2(self):
     def test_plot_cluster_signals_nav2_sig2(self):
         return self.s3.plot_cluster_signals()
 
-    @pytest.mark.mpl_image_compare(
-        baseline_dir=baseline_dir, tolerance=default_tol*2)
     def test_plot_cluster_metric(self):
-        ax = self.s.plot_cluster_metric()
-        return ax.get_figure()
+        self.s.plot_cluster_metric()
 
     def test_except_nocluster_metric(self):
         with pytest.raises(ValueError):

upcoming_changes/3189.maintenance.rst

@@ -0,0 +1 @@
+Fix Numpy1.25 deprecation: implicit array to scalar conversion in :py:meth:`~.signals.Signal2D.align2D`