From 757dd949dd9c4cebd1f5bc75ab3780bf922e11b8 Mon Sep 17 00:00:00 2001 From: Drew Leonard Date: Wed, 3 Jul 2024 11:35:41 +0100 Subject: [PATCH] Fix devdeps build NDCube 2.2 has deprecated `ndcube.data.shape` and replaced it with `ndcube.shape`, which is breaking `dataset.dimensions`. --- dkist/dataset/tests/test_dataset.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dkist/dataset/tests/test_dataset.py b/dkist/dataset/tests/test_dataset.py index e1b64da7..231e7757 100644 --- a/dkist/dataset/tests/test_dataset.py +++ b/dkist/dataset/tests/test_dataset.py @@ -65,16 +65,11 @@ def test_wcs_roundtrip_3d(dataset_3d): assert_quantity_allclose(p[2], p2[2]) -def test_dimensions(dataset, dataset_3d): - for ds in [dataset, dataset_3d]: - assert_quantity_allclose(ds.dimensions, ds.data.shape*u.pix) - - def test_load_from_directory(): ds = load_dataset(rootdir / "EIT") assert isinstance(ds.data, da.Array) assert isinstance(ds.wcs, gwcs.WCS) - assert_quantity_allclose(ds.dimensions, (11, 128, 128)*u.pix) + assert_quantity_allclose(ds.data.shape, (11, 128, 128)) assert ds.files.basepath == Path(rootdir / "EIT") @@ -99,14 +94,14 @@ def test_load_with_old_methods(): ds = Dataset.from_directory(rootdir / "EIT") assert isinstance(ds.data, da.Array) assert isinstance(ds.wcs, gwcs.WCS) - assert_quantity_allclose(ds.dimensions, (11, 128, 128)*u.pix) + assert_quantity_allclose(ds.data.shape, (11, 128, 128)) assert ds.files.basepath == Path(rootdir / "EIT") with pytest.warns(DKISTDeprecationWarning): ds = Dataset.from_asdf(rootdir / "EIT" / "eit_test_dataset.asdf") assert isinstance(ds.data, da.Array) assert isinstance(ds.wcs, gwcs.WCS) - assert_quantity_allclose(ds.dimensions, (11, 128, 128)*u.pix) + assert_quantity_allclose(ds.data.shape, (11, 128, 128)) assert ds.files.basepath == Path(rootdir / "EIT")