diff --git a/dascore/core/coords.py b/dascore/core/coords.py index b0d10caa..8fbe8dfb 100644 --- a/dascore/core/coords.py +++ b/dascore/core/coords.py @@ -429,7 +429,7 @@ def __str__(self): __repr__ = __str__ - def __array__(self): + def __array__(self, dtype=None, copy=False): """Numpy method for getting array data with `np.array(coord)`.""" return self.data diff --git a/dascore/io/dashdf5/core.py b/dascore/io/dashdf5/core.py index 70a71700..b159a245 100644 --- a/dascore/io/dashdf5/core.py +++ b/dascore/io/dashdf5/core.py @@ -16,7 +16,7 @@ class ProdMLPatchAttrs(dc.PatchAttrs): """Patch attrs for ProdML.""" - pulse_width: float = np.NAN + pulse_width: float = np.nan pulse_width_units: UnitQuantity | None = None gauge_length: float = np.nan gauge_length_units: UnitQuantity | None = None diff --git a/dascore/io/prodml/core.py b/dascore/io/prodml/core.py index 887e7bb0..49b940cb 100644 --- a/dascore/io/prodml/core.py +++ b/dascore/io/prodml/core.py @@ -16,7 +16,7 @@ class ProdMLPatchAttrs(dc.PatchAttrs): """Patch attrs for ProdML.""" - pulse_width: float = np.NAN + pulse_width: float = np.nan pulse_width_units: UnitQuantity | None = None gauge_length: float = np.nan gauge_length_units: UnitQuantity | None = None diff --git a/dascore/io/xml_binary/core.py b/dascore/io/xml_binary/core.py index db4828c9..c93be029 100644 --- a/dascore/io/xml_binary/core.py +++ b/dascore/io/xml_binary/core.py @@ -18,7 +18,7 @@ class BinaryPatchAttrs(dc.PatchAttrs): """Patch attrs for Binary.""" - pulse_width_ns: float = np.NAN + pulse_width_ns: float = np.nan gauge_length: float = np.nan instrument_id: UTF8Str = "" distance_units: UTF8Str = "" diff --git a/dascore/transform/integrate.py b/dascore/transform/integrate.py index 6f83832f..6c1565f3 100644 --- a/dascore/transform/integrate.py +++ b/dascore/transform/integrate.py @@ -46,9 +46,9 @@ def _get_new_coords_and_array(patch, array, dims): for dxs_or_val, ax in zip(dxs_or_vals, axes): indexer = broadcast_for_index(ndims, ax, None, fill=slice(None)) if is_array(dxs_or_val): - array = np.trapz(array, x=dxs_or_val, axis=ax)[indexer] + array = np.trapezoid(array, x=dxs_or_val, axis=ax)[indexer] else: - array = np.trapz(array, dx=dxs_or_val, axis=ax)[indexer] + array = np.trapezoid(array, dx=dxs_or_val, axis=ax)[indexer] array, coords = _get_new_coords_and_array(patch, array, dims) return array, coords diff --git a/dascore/units.py b/dascore/units.py index f351778b..8c278476 100644 --- a/dascore/units.py +++ b/dascore/units.py @@ -34,7 +34,7 @@ def get_registry(): # allow multiplication with offset units. ureg.autoconvert_offset_to_baseunit = True # set the shortest display for units. - ureg.default_format = "~" + ureg.formatter.default_format = "~" pint.set_application_registry(ureg) return ureg diff --git a/pyproject.toml b/pyproject.toml index c174c603..70a62254 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ keywords = ["geophysics", "distributed-acoustic-sensing"] dependencies = [ "h5py", "matplotlib>=3.5", - "numpy>=1.24, <2", + "numpy>=1.24", "packaging", "pandas>=2.0", "pooch>=1.2", diff --git a/tests/test_proc/test_filter.py b/tests/test_proc/test_filter.py index 640ba143..3fb6f1e1 100644 --- a/tests/test_proc/test_filter.py +++ b/tests/test_proc/test_filter.py @@ -38,7 +38,7 @@ def test_wrong_kwarg_length_raises(self, random_patch): def test_all_null_kwarg_raises(self, random_patch): """There must be one Non-null kwarg.""" with pytest.raises(FilterValueError, match="at least one filter"): - _ = random_patch.pass_filter(time=[None, np.NAN]) + _ = random_patch.pass_filter(time=[None, np.nan]) def test_unordered_params(self, random_patch): """Ensure a low parameter greater than a high parameter raises.""" diff --git a/tests/test_transform/test_integrate.py b/tests/test_transform/test_integrate.py index b0ace5bd..dedc26be 100644 --- a/tests/test_transform/test_integrate.py +++ b/tests/test_transform/test_integrate.py @@ -90,7 +90,7 @@ 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.trapz(patch.data, dx=step, axis=ax) + expected_data = np.trapezoid(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])