From 3fa43439da53ed2d957dd9a561b3765217a6d6e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Wed, 13 Mar 2024 17:55:10 +0100 Subject: [PATCH 1/8] Add dask setting to disable query-planning for now --- holoviews/tests/conftest.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/holoviews/tests/conftest.py b/holoviews/tests/conftest.py index b6b02d9296..e815361845 100644 --- a/holoviews/tests/conftest.py +++ b/holoviews/tests/conftest.py @@ -43,9 +43,12 @@ def pytest_collection_modifyitems(config, items): with contextlib.suppress(Exception): # From Dask 2023.7,1 they now automatic convert strings # https://docs.dask.org/en/stable/changelog.html#v2023-7-1 + # From Dask 2024.3,1 they now use a query planning + # https://github.com/dask/dask/issues/10995 import dask dask.config.set({"dataframe.convert-string": False}) + dask.config.set({"dataframe.query-planning": False}) @pytest.fixture From 1b02694721a098f18c79b6f6456819835b71ef4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Wed, 13 Mar 2024 18:12:56 +0100 Subject: [PATCH 2/8] Update holoviews/tests/conftest.py --- holoviews/tests/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/holoviews/tests/conftest.py b/holoviews/tests/conftest.py index e815361845..7d79f2379b 100644 --- a/holoviews/tests/conftest.py +++ b/holoviews/tests/conftest.py @@ -41,9 +41,9 @@ def pytest_collection_modifyitems(config, items): with contextlib.suppress(Exception): - # From Dask 2023.7,1 they now automatic convert strings + # From Dask 2023.7.1 they now automatically convert strings # https://docs.dask.org/en/stable/changelog.html#v2023-7-1 - # From Dask 2024.3,1 they now use a query planning + # From Dask 2024.3.0 they now use `dask_expr` by default # https://github.com/dask/dask/issues/10995 import dask From 993674b24ce1a8af9d87673119bd9874576792a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Wed, 13 Mar 2024 18:55:24 +0100 Subject: [PATCH 3/8] Try to pin dask --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d25e1c47ef..1e7cf08f70 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ # to run and pass the test suite without installing any # of those. extras_require['tests'] = extras_require['tests_core'] + [ - 'dask', + 'dask <2023.3', 'ibis-framework', # Mapped to ibis-sqlite in setup.cfg for conda 'xarray >=0.10.4', 'networkx', From e31d1ba00167d472916738cbd5919d2af6c512c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Wed, 13 Mar 2024 19:00:17 +0100 Subject: [PATCH 4/8] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1e7cf08f70..18b17b04ef 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ # to run and pass the test suite without installing any # of those. extras_require['tests'] = extras_require['tests_core'] + [ - 'dask <2023.3', + 'dask <2024.3', 'ibis-framework', # Mapped to ibis-sqlite in setup.cfg for conda 'xarray >=0.10.4', 'networkx', From 918ec93d83745a4b7adecc8a3b34d1d665f5cbe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Wed, 13 Mar 2024 19:27:25 +0100 Subject: [PATCH 5/8] Hard pin panel --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 18b17b04ef..b0706abf5b 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ "param >=1.12.0,<3.0", "numpy >=1.0", "pyviz_comms >=2.1", - "panel >=1.0", + "panel ==1.4.0b2", "colorcet", "packaging", "pandas >=0.20.0", @@ -45,7 +45,7 @@ # to run and pass the test suite without installing any # of those. extras_require['tests'] = extras_require['tests_core'] + [ - 'dask <2024.3', + 'dask', 'ibis-framework', # Mapped to ibis-sqlite in setup.cfg for conda 'xarray >=0.10.4', 'networkx', From fda39d0dc11982664abfa943179d75d8e8de8a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Wed, 13 Mar 2024 19:37:46 +0100 Subject: [PATCH 6/8] Correct pin in test also --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 151127c47a..769657dc37 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -144,7 +144,7 @@ jobs: run: | conda activate test-environment conda uninstall panel bokeh --force --offline -y || true - pip install bokeh panel --pre + pip install bokeh 'panel==1.4.0b2' --pre echo "Installing dev releases of Panel and Bokeh" >> $GITHUB_STEP_SUMMARY - name: Check packages latest version if: needs.setup.outputs.code_change == 'true' From 885f2a0f8259e68b7cfbb2425f47ce8d973d37b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Thu, 14 Mar 2024 09:24:24 +0100 Subject: [PATCH 7/8] Update setup.py [skip ci] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b0706abf5b..d25e1c47ef 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ "param >=1.12.0,<3.0", "numpy >=1.0", "pyviz_comms >=2.1", - "panel ==1.4.0b2", + "panel >=1.0", "colorcet", "packaging", "pandas >=0.20.0", From a7550984885c7e1b91b9db032289227f449b7c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Thu, 14 Mar 2024 10:25:01 +0100 Subject: [PATCH 8/8] Update .github/workflows/test.yaml --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 769657dc37..151127c47a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -144,7 +144,7 @@ jobs: run: | conda activate test-environment conda uninstall panel bokeh --force --offline -y || true - pip install bokeh 'panel==1.4.0b2' --pre + pip install bokeh panel --pre echo "Installing dev releases of Panel and Bokeh" >> $GITHUB_STEP_SUMMARY - name: Check packages latest version if: needs.setup.outputs.code_change == 'true'