From 3a9fa94e26dbae08ffd5750839d985661f5d4679 Mon Sep 17 00:00:00 2001 From: James Bourbeau Date: Wed, 3 Jul 2024 10:51:15 -0500 Subject: [PATCH 1/2] Bump pandas to 2.0 in mindeps build --- .github/workflows/tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index cdd8150ec2..49c4531eb2 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -83,12 +83,12 @@ jobs: - os: ubuntu-latest environment: mindeps label: pandas - extra_packages: [numpy=1.21, pandas=1.3, pyarrow=7, pyarrow-hotfix] + extra_packages: [numpy=1.21, pandas=2.0, pyarrow=7, pyarrow-hotfix] partition: "ci1" - os: ubuntu-latest environment: mindeps label: pandas - extra_packages: [numpy=1.21, pandas=1.3, pyarrow=7, pyarrow-hotfix] + extra_packages: [numpy=1.21, pandas=2.0, pyarrow=7, pyarrow-hotfix] partition: "not ci1" - os: ubuntu-latest From ce30558de186d5a1ee757782d638828f9a04ffed Mon Sep 17 00:00:00 2001 From: James Bourbeau Date: Wed, 3 Jul 2024 11:03:47 -0500 Subject: [PATCH 2/2] Handle dask-expr not being installed --- distributed/protocol/tests/test_highlevelgraph.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distributed/protocol/tests/test_highlevelgraph.py b/distributed/protocol/tests/test_highlevelgraph.py index 33de277a53..ba1f6478a8 100644 --- a/distributed/protocol/tests/test_highlevelgraph.py +++ b/distributed/protocol/tests/test_highlevelgraph.py @@ -6,12 +6,12 @@ np = pytest.importorskip("numpy") pd = pytest.importorskip("pandas") +dd = pytest.importorskip("dask.dataframe") +da = pytest.importorskip("dask.array") from numpy.testing import assert_array_equal import dask -import dask.array as da -import dask.dataframe as dd from distributed.diagnostics import SchedulerPlugin from distributed.utils_test import gen_cluster