From 288a62923d1def6d6a7cd34d290c3561e8aee13b Mon Sep 17 00:00:00 2001 From: Oriol Abril-Pla Date: Mon, 24 Jun 2024 19:21:16 +0200 Subject: [PATCH] Use bokeh 3.0 (#2356) * Try bokeh 3 * dependency related fixes * update bokeh pin for docs * black --- .azure-pipelines/azure-pipelines-base.yml | 2 +- arviz/plots/backends/bokeh/pairplot.py | 8 ++------ requirements-docs.txt | 2 +- requirements-optional.txt | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-base.yml b/.azure-pipelines/azure-pipelines-base.yml index 3187491cfe..6e17ccd6b0 100644 --- a/.azure-pipelines/azure-pipelines-base.yml +++ b/.azure-pipelines/azure-pipelines-base.yml @@ -63,7 +63,7 @@ jobs: displayName: 'Install base requirements' - script: | - python -m pip install --no-cache-dir --pre -r requirements-optional.txt + python -m pip install --no-cache-dir -r requirements-optional.txt condition: and(succeeded(), eq(variables.OptionalRequirements, true)) displayName: 'Install optional requirements' diff --git a/arviz/plots/backends/bokeh/pairplot.py b/arviz/plots/backends/bokeh/pairplot.py index f17622717d..ca23bedbf8 100644 --- a/arviz/plots/backends/bokeh/pairplot.py +++ b/arviz/plots/backends/bokeh/pairplot.py @@ -174,12 +174,8 @@ def plot_pair( source = ColumnDataSource(data=source_dict) if divergences: - source_nondiv = CDSView( - source=source, filters=[GroupFilter(column_name=divergenve_name, group="0")] - ) - source_div = CDSView( - source=source, filters=[GroupFilter(column_name=divergenve_name, group="1")] - ) + source_nondiv = CDSView(filters=[GroupFilter(column_name=divergenve_name, group="0")]) + source_div = CDSView(filters=[GroupFilter(column_name=divergenve_name, group="1")]) def get_width_and_height(jointplot, rotate): """Compute subplots dimensions for two or more variables.""" diff --git a/requirements-docs.txt b/requirements-docs.txt index 43ed21e27b..40612cf5f6 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -9,7 +9,7 @@ myst-parser myst-nb sphinx-notfound-page sphinx-copybutton -bokeh<3 +bokeh>=3 contourpy sphinx_design sphinx-codeautolink>=0.9.0 diff --git a/requirements-optional.txt b/requirements-optional.txt index dbff40542d..0e3f442cdc 100644 --- a/requirements-optional.txt +++ b/requirements-optional.txt @@ -1,8 +1,8 @@ numba netcdf4 -bokeh>=1.4.0,<3.0 +bokeh>=3 contourpy ujson dask[distributed] -zarr>=2.5.0 +zarr>=2.5.0,<3 xarray-datatree