From 18b1305dab30b8007de714bca44b26a7bf66ed85 Mon Sep 17 00:00:00 2001
From: Simon Perkins <simon.perkins@gmail.com>
Date: Wed, 31 May 2023 13:22:34 +0200
Subject: [PATCH 1/3] Update dask-ms to 0.2.16 (#113)

---
 pyproject.toml                    |  4 +---
 shade_ms/tests/test_dask_utils.py |  2 +-
 test-dataframe-factory.py         | 23 -----------------------
 3 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 test-dataframe-factory.py

diff --git a/pyproject.toml b/pyproject.toml
index 9202900..4a6f84a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,14 +26,12 @@ shadems = {reference = "bin/shadems", type = "file"}
 [tool.poetry.dependencies]
 python = "^3.8"
 datashader = "^0.13.0"
-dask-ms = { version = "^0.2.15", extras = ["xarray"] }
+dask-ms = { version = "^0.2.16", extras = ["xarray"] }
 holoviews = "^1.14.9"
 matplotlib = { version = "^3.6.0" }
 cmasher = "^1.6.3"
 future-fstrings = "^1.2.0"
 requests = "^2.27.1"
-numpy = "1.23.5" # Datashader installs the latest numpy which is in conflict with <=1.35.5 required by numba 
-dask = { extras = ["array"], version = "2022.9.1" } # Datashader installs the latest dask which is in conflict with <2023.0.0 required by dask-ms[array]
 pytest = { version = "^7.2.2", optional=true }
 pytest-flake8 = { version = "^1.1.1", optional=true }
 
diff --git a/shade_ms/tests/test_dask_utils.py b/shade_ms/tests/test_dask_utils.py
index 1ba44fa..31b3c84 100644
--- a/shade_ms/tests/test_dask_utils.py
+++ b/shade_ms/tests/test_dask_utils.py
@@ -92,7 +92,7 @@ def test_dataframe_factory_multicol():
     assert_array_equal(df['c0'].min(), data1c.min())
     assert_array_equal(df['c0'].max(), data1c.max())
 
-    df = df.append(df)
+    df = dd.multi.concat([df, df])
 
     assert_array_equal(df['x'].min(), data1a.min())
     assert_array_equal(df['x'].max(), data1a.max())
diff --git a/test-dataframe-factory.py b/test-dataframe-factory.py
deleted file mode 100644
index ed13f93..0000000
--- a/test-dataframe-factory.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import dask.array as da
-from shade_ms.dask_utils import dataframe_factory, multicol_dataframe_factory
-
-
-nrow, nfreq, ncorr = 100, 100, 4
-
-data1a = da.arange(nrow, chunks=(10,))
-
-data1b = da.zeros(dtype=float, shape=(nfreq,), chunks=(100,))
-
-data1c = da.zeros(dtype=float, shape=(nfreq,ncorr), chunks=(100,4))
-
-data1d = da.zeros(dtype=float, shape=())
-
-df = dataframe_factory(("row", "chan"),
-                       data1a, ("row",),
-                       data1b, ("chan",))
-
-df1 = multicol_dataframe_factory(("row", "chan", "corr"),
-                                 dict(a=data1a, b=data1b, x=data1c, y=data1d),
-                                 dict(a=("row",), b=("chan",), x=("chan", "corr"), y=()))
-
-print(df1['y'])
\ No newline at end of file

From 60e9b55f4bbe2cc8dc9fc46d262e7565d7cabb5b Mon Sep 17 00:00:00 2001
From: Simon Perkins <simon.perkins@gmail.com>
Date: Wed, 31 May 2023 13:43:08 +0200
Subject: [PATCH 2/3] Upgrade datashader to 0.15.0 (#114)

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 4a6f84a..aa1eff6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,7 +25,7 @@ shadems = {reference = "bin/shadems", type = "file"}
 
 [tool.poetry.dependencies]
 python = "^3.8"
-datashader = "^0.13.0"
+datashader = "^0.15.0"
 dask-ms = { version = "^0.2.16", extras = ["xarray"] }
 holoviews = "^1.14.9"
 matplotlib = { version = "^3.6.0" }

From d1de7ade2fdab551a0d34ff64e7fcdd2a5a2ba94 Mon Sep 17 00:00:00 2001
From: Simon Perkins <simon.perkins@gmail.com>
Date: Wed, 31 May 2023 14:12:16 +0200
Subject: [PATCH 3/3] Add end to end test (#115)

* Add end to end test

* correct shadems call
---
 .github/workflows/ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8cb5adf..a6cc78c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,6 +48,13 @@ jobs:
       - name: Run testsuite
         run: poetry run py.test -vvv shade_ms/
 
+      - name: Download test dataset
+        run: curl https://ratt-public-data.s3.af-south-1.amazonaws.com/test-data/HLTau_B6cont.calavg.tav300s.tar.xz | tar xJf -
+
+      - name: Run end to end test
+        run: poetry run python bin/shadems HLTau_B6cont.calavg.tav300s
+
+
   # deploy:
   #   needs: [test]
   #   runs-on: ubuntu-latest