gh-223: fixes for NumPy 2 (#224)

Author: ntessore

heracles/healpy.py

@@ -48,7 +48,7 @@ def wrapper(*args):
         newargs = []
         for arr in args:
             if arr.dtype.byteorder != "=":
-                arr = arr.newbyteorder("=").byteswap()
+                arr = arr.view(arr.dtype.newbyteorder("=")).byteswap()
             newargs.append(arr)
         return fn(*newargs)
 

heracles/io.py

@@ -214,14 +214,15 @@ def _write_map(fits, ext, key, m, *, names=None):
 
 def _read_map(hdu):
     """read HEALPix map from FITS table"""
+    from numpy.lib.recfunctions import structured_to_unstructured
 
     # read the map from the extension
     m = hdu.read()
 
     # turn the structured array of columns into an unstructured array
     # transpose so that columns become rows (as that is how maps are)
     # then squeeze out degenerate axes
-    m = np.squeeze(np.lib.recfunctions.structured_to_unstructured(m).T)
+    m = np.squeeze(structured_to_unstructured(m).T)
 
     # read and attach metadata
     m.dtype = np.dtype(m.dtype, metadata=_read_metadata(hdu))

heracles/result.py

@@ -79,8 +79,13 @@ def __array_finalize__(self, obj: NDArray[Any] | None) -> None:
         self.upper = getattr(obj, "upper", None)
         self.weight = getattr(obj, "weight", None)
 
-    def __array_wrap__(self, context=None, return_scalar=False):
-        return super().__array_wrap__(context, return_scalar).view(np.ndarray)
+    def __array_wrap__(self, arr, context=None, return_scalar=False):
+        out = super().__array_wrap__(arr, context)
+        if out is self or type(self) is not Result:
+            return out
+        if return_scalar:
+            return out.item()
+        return out.view(np.ndarray)
 
 
 def binned(result, bins, weight=None):