From 2def7ac8c12cf8dee0b56dd68019508110d302f3 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 19 Sep 2023 15:28:07 +0200 Subject: [PATCH 1/3] Remove xarray from testing dependencies --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index abacdaf8..162cc6c7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ xarray = ["xarray"] zarr = ["zarr"] s3 = ["s3fs"] complete = ["s3fs", "pyarrow", "xarray", "zarr"] -testing = ["minio", "pytest", "xarray"] +testing = ["minio", "pytest"] [tool.poetry.group.dev.dependencies] tbump = "^6.9.0" From 45ec18b3f279625874abcf73bed08dbddf7c0e56 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 19 Sep 2023 15:38:08 +0200 Subject: [PATCH 2/3] Fixup assigns --- .../experimental/fragments/tests/test_fragments.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/daskms/experimental/fragments/tests/test_fragments.py b/daskms/experimental/fragments/tests/test_fragments.py index 557f08fc..258ba87d 100644 --- a/daskms/experimental/fragments/tests/test_fragments.py +++ b/daskms/experimental/fragments/tests/test_fragments.py @@ -66,7 +66,7 @@ def test_fragment_with_update(ms, tmp_path_factory, group_cols): fragment_path = tmp_dir / "fragment.ms" updates = [ - xds.assign({"DATA": (xds.DATA.dims, da.ones_like(xds.DATA.data))}) + xds.assign(**{"DATA": (xds.DATA.dims, da.ones_like(xds.DATA.data))}) for xds in reads ] @@ -98,7 +98,7 @@ def test_nonoverlapping_parents(ms, tmp_path_factory, group_cols): fragment1_path = tmp_dir / "fragment1.ms" updates = [ - xds.assign({"DATA": (xds.DATA.dims, da.zeros_like(xds.DATA.data))}) + xds.assign(**{"DATA": (xds.DATA.dims, da.zeros_like(xds.DATA.data))}) for xds in reads ] @@ -113,7 +113,7 @@ def test_nonoverlapping_parents(ms, tmp_path_factory, group_cols): ) updates = [ - xds.assign({"UVW": (xds.UVW.dims, da.zeros_like(xds.UVW.data))}) + xds.assign(**{"UVW": (xds.UVW.dims, da.zeros_like(xds.UVW.data))}) for xds in fragment0_reads ] @@ -147,7 +147,7 @@ def test_overlapping_parents(ms, tmp_path_factory, group_cols): fragment1_path = tmp_dir / "fragment1.ms" updates = [ - xds.assign({"DATA": (xds.DATA.dims, da.ones_like(xds.DATA.data))}) + xds.assign(**{"DATA": (xds.DATA.dims, da.ones_like(xds.DATA.data))}) for xds in reads ] @@ -162,7 +162,7 @@ def test_overlapping_parents(ms, tmp_path_factory, group_cols): ) updates = [ - xds.assign({"DATA": (xds.DATA.dims, da.zeros_like(xds.DATA.data))}) + xds.assign(**{"DATA": (xds.DATA.dims, da.zeros_like(xds.DATA.data))}) for xds in fragment0_reads ] @@ -304,7 +304,7 @@ def test_subtable_fragment_with_update(spw_table, tmp_path_factory): updates = [ xds.assign( - {"CHAN_FREQ": (xds.CHAN_FREQ.dims, da.ones_like(xds.CHAN_FREQ.data))} + **{"CHAN_FREQ": (xds.CHAN_FREQ.dims, da.ones_like(xds.CHAN_FREQ.data))} ) for xds in reads ] From e5f21878aaba501e6a588fe542b41b897c8a81f6 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 19 Sep 2023 15:53:46 +0200 Subject: [PATCH 3/3] [skip ci] Update HISTORY.rst --- HISTORY.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 431fc987..a970f370 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,7 +4,7 @@ History X.Y.Z (YYYY-MM-DD) ------------------ -* Add experimental fragments functionality (:pr:`282`) +* Add experimental fragments functionality (:pr:`282`, :pr:`291`) * Run CI weekly on Monday @ 2h30 am UTC (:pr:`288`) * Update minio server and client versions (:pr:`287`) * Retain ROWID coordinates during MS conversion (:pr:`286`)