From d82ad561d90714caf49d580d561186cf4edf702d Mon Sep 17 00:00:00 2001 From: Tom White Date: Thu, 6 Feb 2025 12:04:54 +0000 Subject: [PATCH 1/2] Run CI against upstream cubed and xarray --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cc81af1..0b1dd30 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,6 +47,7 @@ jobs: run: | uv pip install --system '.' uv pip install --system '.[test]' + uv pip install --system 'cubed @ git+https://github.com/cubed-dev/cubed.git' 'xarray @ git+https://github.com/pydata/xarray.git' - name: Running Tests run: | From 5e5f08a3ca76c65dc1cf144752c836f92b680871 Mon Sep 17 00:00:00 2001 From: Tom White Date: Tue, 14 Jan 2025 17:18:15 +0000 Subject: [PATCH 2/2] Fixes following xarray upstream improvements --- cubed_xarray/tests/test_xarray.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/cubed_xarray/tests/test_xarray.py b/cubed_xarray/tests/test_xarray.py index ac85e68..4c74afc 100644 --- a/cubed_xarray/tests/test_xarray.py +++ b/cubed_xarray/tests/test_xarray.py @@ -178,7 +178,6 @@ def test_repr(self): ) assert expected == repr(self.lazy_var) - @pytest.mark.xfail(reason="duck array ops problem in xarray") def test_pickle(self): # Test that pickling/unpickling does not convert the cubed # backend to numpy @@ -324,7 +323,6 @@ def test_chunk(self) -> None: assert rechunked.chunksizes == expected_chunksizes - @pytest.mark.xfail(reason="cubed rechunk bug") def test_rechunk(self): chunked = self.eager_array.chunk({"x": 2}).chunk( {"y": 2}, chunked_array_type="cubed" @@ -456,7 +454,6 @@ def test_duplicate_dims(self): assert chunked_array.chunks == ((2, 2), (2, 2)) assert chunked_array.chunksizes == {"x": (2, 2)} - @pytest.mark.xfail(reason="duck array ops problem in xarray") def test_stack(self): data = cubed.random.random(size=(2, 3, 4), chunks=(1, 3, 4)) arr = DataArray(data, dims=("w", "x", "y"))