pint numpy compat

dascore/transform/integrate.py

@@ -44,11 +44,13 @@ def _get_new_coords_and_array(patch, array, dims):
     array = patch.data
     ndims = len(patch.shape)
     for dxs_or_val, ax in zip(dxs_or_vals, axes):
+        # Numpy 2/3 compat code
+        trap = getattr(np, "trapezoid", getattr(np, "trapz"))
         indexer = broadcast_for_index(ndims, ax, None, fill=slice(None))
         if is_array(dxs_or_val):
-            array = np.trapezoid(array, x=dxs_or_val, axis=ax)[indexer]
+            array = trap(array, x=dxs_or_val, axis=ax)[indexer]
         else:
-            array = np.trapezoid(array, dx=dxs_or_val, axis=ax)[indexer]
+            array = trap(array, dx=dxs_or_val, axis=ax)[indexer]
     array, coords = _get_new_coords_and_array(patch, array, dims)
     return array, coords
 

dascore/units.py

@@ -34,7 +34,9 @@ def get_registry():
     # allow multiplication with offset units.
     ureg.autoconvert_offset_to_baseunit = True
     # set the shortest display for units.
-    ureg.formatter.default_format = "~"
+    # .formatter was added in new versions of pint; this makes it work with both
+    formatter = getattr(ureg, "formatter", ureg)
+    formatter.default_format = "~"
     pint.set_application_registry(ureg)
     return ureg
 

scripts/build_api_docs.py

@@ -2,13 +2,18 @@
 
 from __future__ import annotations
 
+import sys
+
 from _index_api import get_alias_mapping, parse_project
 from _qmd_builder import create_quarto_qmd
 from _render_api import render_project
 from _validate_links import validate_all_links
 
 import dascore as dc
 
+sys.stdout.encoding = "utf-8"
+
+
 if __name__ == "__main__":
     print("Building documentation")  # noqa
     print(f"Parsing project {dc.__name__}")  # noqa

tests/test_transform/test_integrate.py

@@ -90,7 +90,8 @@ def test_simple_integration(self, ones_patch):
             out = patch.integrate(dim=dim, definite=True)
             assert out.shape[ax] == 1
             step = to_float(patch.get_coord(dim).step)
-            expected_data = np.trapezoid(patch.data, dx=step, axis=ax)
+            trap = getattr(np, "trapezoid", getattr(np, "trapz"))
+            expected_data = trap(patch.data, dx=step, axis=ax)
             ndims = len(patch.dims)
             indexer = broadcast_for_index(ndims, ax, None)
             assert np.allclose(out.data, expected_data[indexer])