Merge branch 'ratt-ru:master' into master

.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

pyproject.toml

@@ -25,15 +25,13 @@ shadems = {reference = "bin/shadems", type = "file"}
 
 [tool.poetry.dependencies]
 python = "^3.8"
-datashader = "^0.13.0"
-dask-ms = { version = "^0.2.15", extras = ["xarray"] }
+datashader = "^0.15.0"
+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 }
 

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())