MAINT: use .data explicitly instead of relying on __array__

gdementen · gdementen · commit 38925104b915 · 2024-07-16T15:28:05.000+02:00
required for Numpy 2.0 compatibility (issue #1100)
diff --git a/larray/core/array.py b/larray/core/array.py
@@ -1404,9 +1404,8 @@ def describe(self, *args, percentiles=None) -> 'Array':
         #     ...
         # }, 'statistic')
         return stack({
-            # Note that np.isnan works as well as la.isnan thanks to __array_wrap__
-            # and using it avoids having a cyclic import
-            'count': (~np.isnan(self)).sum(*args),
+            # Not using la.isnan to avoid a cyclic import
+            'count': Array(~np.isnan(self.data), self.axes).sum(*args),
             'mean': self.mean(*args),
             'std': self.std(*args),
             'min': self.min(*args),
@@ -2193,6 +2192,7 @@ def __setitem__(self, key, value, collapse_slices=True, translate_key=True, poin
                 text = 'axes are' if len(extra_axes) > 1 else 'axis is'
                 raise ValueError(f"Value {extra_axes!s} {text} not present in target subset {axes!s}. A value can only "
                                  f"have the same axes or fewer axes than the subset being targeted")
+            value = value.data
         self.data[raw_broadcasted_key] = value
 
         # concerning keys this can make sense in several cases:
diff --git a/larray/core/axis.py b/larray/core/axis.py
@@ -3663,7 +3663,7 @@ def _flat_lookup(self, flat_indices):
         # TODO: this should be:
         # return stack({axis.name: axis.i[inds] for axis, inds in zip(axes, axes_indices)}, axis='axis')
         flat_axes = flat_indices.axes
-        axes_labels = self._iflat(flat_indices)
+        axes_labels = self._iflat(flat_indices.data)
         return stack({axis.name: Array(axis_labels, flat_axes) for axis, axis_labels in zip(self, axes_labels)}, 'axis')
 
     def _adv_keys_to_combined_axis_la_keys(self, key, wildcard=False, sep='_'):
