From c21260e1f39396e2bd6e1df43e294a082dba4a06 Mon Sep 17 00:00:00 2001 From: Oriol Abril-Pla Date: Sun, 23 Jun 2024 16:32:06 +0200 Subject: [PATCH 1/4] Try bokeh 3 --- requirements-optional.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-optional.txt b/requirements-optional.txt index dbff40542d..62b9cca1c0 100644 --- a/requirements-optional.txt +++ b/requirements-optional.txt @@ -1,6 +1,6 @@ numba netcdf4 -bokeh>=1.4.0,<3.0 +bokeh>=3 contourpy ujson dask[distributed] From 1b0776dee07c202434eaea72045ddfcbe12de01f Mon Sep 17 00:00:00 2001 From: "Oriol (ProDesk)" Date: Mon, 24 Jun 2024 16:31:56 +0200 Subject: [PATCH 2/4] dependency related fixes --- .azure-pipelines/azure-pipelines-base.yml | 2 +- arviz/plots/backends/bokeh/pairplot.py | 4 ++-- requirements-optional.txt | 2 +- 3 files changed, 4 insertions(+), 4 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..c9e3ce43d5 100644 --- a/arviz/plots/backends/bokeh/pairplot.py +++ b/arviz/plots/backends/bokeh/pairplot.py @@ -175,10 +175,10 @@ def plot_pair( if divergences: source_nondiv = CDSView( - source=source, filters=[GroupFilter(column_name=divergenve_name, group="0")] + filters=[GroupFilter(column_name=divergenve_name, group="0")] ) source_div = CDSView( - source=source, filters=[GroupFilter(column_name=divergenve_name, group="1")] + filters=[GroupFilter(column_name=divergenve_name, group="1")] ) def get_width_and_height(jointplot, rotate): diff --git a/requirements-optional.txt b/requirements-optional.txt index 62b9cca1c0..0e3f442cdc 100644 --- a/requirements-optional.txt +++ b/requirements-optional.txt @@ -4,5 +4,5 @@ bokeh>=3 contourpy ujson dask[distributed] -zarr>=2.5.0 +zarr>=2.5.0,<3 xarray-datatree From a2ad7a1a8a2e5ef97e6a8f0b65727ea199da6eaf Mon Sep 17 00:00:00 2001 From: "Oriol (ProDesk)" Date: Mon, 24 Jun 2024 16:34:25 +0200 Subject: [PATCH 3/4] update bokeh pin for docs --- requirements-docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 681275514f705e9b18c1e0a2a0f416f85f766873 Mon Sep 17 00:00:00 2001 From: "Oriol (ProDesk)" Date: Mon, 24 Jun 2024 18:57:28 +0200 Subject: [PATCH 4/4] black --- arviz/plots/backends/bokeh/pairplot.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arviz/plots/backends/bokeh/pairplot.py b/arviz/plots/backends/bokeh/pairplot.py index c9e3ce43d5..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( - filters=[GroupFilter(column_name=divergenve_name, group="0")] - ) - source_div = CDSView( - 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."""