Merge pull request #1607 from LOCEANlloydizard/try-unpin-pandas

Check unpin pandas < 3
Closes #1600

Author: LOCEANlloydizard

echopype/echodata/utils_platform.py

@@ -26,8 +26,7 @@ def _clip_by_time_dim(external_ds, ext_time_dim_name, ping_time):
     min and max ping_time and taking all the times between those indices.
     """
 
-    sorted_external_time = external_ds[ext_time_dim_name].data
-    sorted_external_time.sort()
+    sorted_external_time = np.sort(external_ds[ext_time_dim_name].data)
 
     min_index = max(
         np.searchsorted(sorted_external_time, ping_time.min(), side="left") - 1,

echopype/qc/api.py

@@ -64,7 +64,8 @@ def coerce_increasing_time(
     would remain undisturbed.
     """
 
-    ds[time_name].data[:] = _clean_reversed(ds[time_name].data, win_len)
+    da = ds[time_name]
+    ds[time_name] = (da.dims, _clean_reversed(da.values, win_len))
 
 
 def exist_reversed_time(ds, time_name):

echopype/testing.py

@@ -15,12 +15,12 @@
 
 
 def _gen_ping_time(ping_time_len, ping_time_interval, ping_time_jitter_max_ms=0):
-    ping_time = pd.date_range("2018-07-01", periods=ping_time_len, freq=ping_time_interval)
+    ping_time = pd.Timestamp("2018-07-01") + pd.to_timedelta(
+        np.arange(ping_time_len) * pd.to_timedelta(ping_time_interval)
+    )
     if ping_time_jitter_max_ms != 0:  # if to add jitter
-        jitter = (
-            np.random.randint(ping_time_jitter_max_ms, size=ping_time_len) / 1000
-        )  # convert to seconds
-        ping_time = pd.to_datetime(ping_time.astype("int64") / 1e9 + jitter, unit="s")
+        jitter = np.random.randint(ping_time_jitter_max_ms, size=ping_time_len)  # integer ms
+        ping_time = (ping_time + pd.to_timedelta(jitter, unit="ms")).sort_values()
     return ping_time
 
 

echopype/tests/commongrid/test_commongrid_api.py

@@ -332,7 +332,9 @@ def test_compute_MVBS_range_output(request, er_type):
     ds_MVBS = ep.commongrid.compute_MVBS(ds_Sv, range_bin="5m", ping_time_bin="10s")
 
     if er_type == "regular":
-        dt_ns = np.diff(ds_Sv["ping_time"][[0, -1]].values)[0]
+        dt_ns = pd.Timedelta(
+            ds_Sv["ping_time"].values[-1] - ds_Sv["ping_time"].values[0]
+        ).value
         expected_len = (
             ds_Sv["channel"].size,  # channel
             int(np.ceil(int(dt_ns) / 1e9 / 10)),  # ping_time

echopype/tests/consolidate/test_add_location.py

@@ -249,7 +249,11 @@ def test_add_location_time_duplicates_value_error(
     )
 
     # Add duplicates to `time_dim`
-    ed["Platform"][time_dim_name].data[0] = ed["Platform"][time_dim_name].data[1]
+    # Make a writable copy before modifying the coordinate values
+    da = ed["Platform"][time_dim_name]
+    vals = da.to_numpy().copy()
+    vals[0] = vals[1]
+    ed["Platform"] = ed["Platform"].assign_coords({time_dim_name: (da.dims, vals)})
 
     # Check if the expected error is logged
     with pytest.raises(ValueError) as exc_info:

echopype/tests/echodata/test_echodata_combine.py

@@ -220,7 +220,9 @@ def attr_time_to_dt(time_str):
 
             # correctly set filenames values for constructed combined Dataset
             if "filenames" in test_ds:
-                test_ds.filenames.values[:] = np.arange(len(test_ds.filenames), dtype=int)
+                test_ds = test_ds.assign_coords(
+                    filenames=np.arange(test_ds.sizes["filenames"], dtype=int)
+                )
 
             # correctly modify Provenance attributes, so we can do a direct compare
             if group_name == "Provenance":

requirements.txt

@@ -8,7 +8,7 @@ geopy
 jinja2
 netCDF4>1.6
 numpy
-pandas<3
+pandas
 psutil>=5.9.1
 pynmea2
 pytz