From 794a1f73e1941669ace4c4af774d0223a1ae51dd Mon Sep 17 00:00:00 2001
From: Simon Perkins <simon.perkins@gmail.com>
Date: Tue, 26 Mar 2024 16:08:36 +0200
Subject: [PATCH] skip imports

---
 daskms/experimental/katdal/msv2_proxy.py      | 24 ++++---------------
 daskms/experimental/katdal/tests/conftest.py  |  1 -
 .../katdal/tests/test_chunkstore.py           | 14 +----------
 3 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/daskms/experimental/katdal/msv2_proxy.py b/daskms/experimental/katdal/msv2_proxy.py
index 930fe22d..1aebe076 100644
--- a/daskms/experimental/katdal/msv2_proxy.py
+++ b/daskms/experimental/katdal/msv2_proxy.py
@@ -3,24 +3,11 @@
 import dask.array as da
 import numpy as np
 
-from daskms.utils import requires
-
-try:
-    from katdal.dataset import DataSet
-    from katdal.lazy_indexer import DaskLazyIndexer
-    from katpoint import Timestamp
-    import numba
-except ImportError as e:
-    kat_import_error = e
-else:
-    kat_import_error = None
-
-try:
-    import xarray
-except ImportError as e:
-    xarray_import_error = e
-else:
-    xarray_import_error = None
+from katdal.dataset import DataSet
+from katdal.lazy_indexer import DaskLazyIndexer
+from katpoint import Timestamp
+import numba
+import xarray
 
 from daskms.experimental.katdal.corr_products import corrprod_index
 from daskms.experimental.katdal.transpose import transpose
@@ -59,7 +46,6 @@ def __new__(cls, name, bases, dct):
         return type.__new__(cls, name, bases, dct)
 
 
-@requires("pip install dask-ms[katdal, xarray]", kat_import_error, xarray_import_error)
 class MSv2DatasetProxy(metaclass=MSv2DataProxyMetaclass):
     """Proxies a katdal dataset to present an MSv2 view over archive data"""
 
diff --git a/daskms/experimental/katdal/tests/conftest.py b/daskms/experimental/katdal/tests/conftest.py
index e8d4ef72..9a82f4f3 100644
--- a/daskms/experimental/katdal/tests/conftest.py
+++ b/daskms/experimental/katdal/tests/conftest.py
@@ -1,7 +1,6 @@
 import pytest
 
 katdal = pytest.importorskip("katdal")
-katpoint = pytest.importorskip("katpoint")
 
 import numpy as np
 
diff --git a/daskms/experimental/katdal/tests/test_chunkstore.py b/daskms/experimental/katdal/tests/test_chunkstore.py
index 92bd1b97..90e5b111 100644
--- a/daskms/experimental/katdal/tests/test_chunkstore.py
+++ b/daskms/experimental/katdal/tests/test_chunkstore.py
@@ -1,25 +1,13 @@
-from functools import partial
-
 import pytest
 
-dask = pytest.importorskip("dask")
-da = pytest.importorskip("dask.array")
 xarray = pytest.importorskip("xarray")
 katdal = pytest.importorskip("katdal")
-katpoint = pytest.importorskip("katpoint")
 
-import numba
+import dask
 import numpy as np
 from numpy.testing import assert_array_equal
 
 from daskms.experimental.zarr import xds_from_zarr, xds_to_zarr
-
-from katdal.lazy_indexer import DaskLazyIndexer
-from katpoint import Timestamp
-
-from daskms.experimental.katdal.transpose import transpose
-from daskms.experimental.katdal.corr_products import corrprod_index
-from daskms.experimental.katdal.uvw import uvw_coords
 from daskms.experimental.katdal.msv2_proxy import MSv2DatasetProxy