Error in solving merge conflicts

dtscalibration · Jul 27, 2023 · 26223aa · 26223aa
1 parent b72d407
commit 26223aa
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/src/dtscalibration/datastore_utils.py b/src/dtscalibration/datastore_utils.py
@@ -246,8 +246,6 @@ def merge_double_ended_times(ds_fw, ds_bw, verify_timedeltas=True, verbose=True)
 
     # throw out is dt differs from its neighbors
     if verify_timedeltas:
-        dt = (ds_bw.isel(time=iuse_chbw).time.values - ds_fw.isel(time=iuse_chfw).time.values) /\
-             np.array(1000000000, dtype='timedelta64[ns]')
         dt = (
             (ds_bw.isel(time=iuse_chbw).time.values - ds_fw.isel(time=iuse_chfw).time.values) /
             np.timedelta64(1, "s"))

diff --git a/tests/test_datastore.py b/tests/test_datastore.py
@@ -556,8 +556,6 @@ def read_data_from_fp_numpy(fp):
 
 
 def test_resample_datastore():
-    import xarray as xr
-
     filepath = data_dir_single_ended
     ds = read_silixa_files(
         directory=filepath, timezone_netcdf='UTC', file_ext='*.xml')