Merge branch 'master' into rechunk_by_size

.github/workflows/ci.yml

@@ -4,8 +4,8 @@ on: [push, pull_request]
 
 env:
   POETRY_VERSION: 1.2.1
-  MINIO_SERVER_DOWNLOAD_URL: https://dl.min.io/server/minio/release/linux-amd64/archive/minio_20220917000945.0.0_amd64.deb
-  MINIO_CLIENT_DOWNLOAD_URL: https://dl.min.io/client/mc/release/linux-amd64/archive/mcli_20220916091647.0.0_amd64.deb
+  MINIO_SERVER_DOWNLOAD_URL: https://dl.min.io/server/minio/release/linux-amd64/archive/minio_20230907020502.0.0_amd64.deb
+  MINIO_CLIENT_DOWNLOAD_URL: https://dl.min.io/client/mc/release/linux-amd64/archive/mcli_20230907224855.0.0_amd64.deb
 
 jobs:
   check_skip:

HISTORY.rst

@@ -2,6 +2,10 @@
 History
 =======
 
+X.Y.Z (YYYY-MM-DD)
+------------------
+* Update minio server and client versions (:pr:`287`)
+
 0.2.17 (2023-08-02)
 ------------------
 * Change setmaxcachesize to require a read lock, not a write lock (:pr:`281`)

daskms/apps/convert.py

@@ -228,10 +228,6 @@ def convert_table(self, args):
 
         datasets = reader(args.input, chunks=args.chunks)
 
-        if isinstance(in_fmt, CasaFormat):
-            # Drop any ROWID columns
-            datasets = [ds.drop_vars("ROWID", errors="ignore") for ds in datasets]
-
         if exclude_columns := args.exclude.get("MAIN", False):
             datasets = [
                 ds.drop_vars(exclude_columns, errors="ignore") for ds in datasets
@@ -273,9 +269,6 @@ def convert_table(self, args):
                     ds.drop_vars(exclude_columns, errors="ignore") for ds in datasets
                 ]
 
-            if isinstance(in_fmt, CasaFormat):
-                datasets = [ds.drop_vars("ROWID", errors="ignore") for ds in datasets]
-
             writes.append(writer(datasets, out_store))
 
         return writes

daskms/apps/tests/test_convert.py

@@ -49,6 +49,7 @@ def test_convert_application(tau_ms, format, tmp_path_factory):
     for ds in datasets:
         assert "MODEL_DATA" not in ds.data_vars
         assert "FLAG" in ds.data_vars
+        assert "ROWID" in ds.coords
 
     datasets = xds_from_storage_table(f"{str(OUTPUT)}::POINTING")
 

daskms/conftest.py

@@ -342,6 +342,7 @@ def minio_admin(minio_client, minio_alias, minio_user_key):
     minio_admin.user_add(minio_user_key, minio_user_key)
     minio_admin.policy_set("readwrite", user=minio_user_key)
     yield minio_admin
+    minio_admin.user_remove(minio_user_key)
 
 
 @pytest.fixture