From f852d4d66dc2b473661e710d9641de8cc8f0edb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Thu, 27 Jun 2024 08:48:49 +0200 Subject: [PATCH 1/7] Update to Bokeh 3.5 rc1 --- pixi.toml | 5 +++-- pyproject.toml | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pixi.toml b/pixi.toml index c6b72971..9f318590 100644 --- a/pixi.toml +++ b/pixi.toml @@ -23,10 +23,11 @@ lint = ["py311", "lint"] download-data = ["download-data"] [dependencies] -bokeh = ">=3.4.0,<3.5.0" +# bokeh = "3.5.*" +bokeh = "3.5.0rc1" cartopy = ">=0.18.0" holoviews = ">=1.16.0" -nodejs = "20.9.*" # 20.12.2 breaks bokeh build on Windows: https://github.com/bokeh/bokeh/pull/13851, removed with Bokeh 3.5 +nodejs = "*" numpy = "*" packaging = "*" panel = ">=1.0.0" diff --git a/pyproject.toml b/pyproject.toml index 40625a1d..813c739a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,6 @@ [build-system] -requires = ["hatchling", "hatch-vcs", 'bokeh ==3.4'] +# requires = ["hatchling", "hatch-vcs", 'bokeh ==3.5'] +requires = ["hatchling", "hatch-vcs", 'bokeh ==3.5.0rc1'] build-backend = "hatchling.build" [project] @@ -27,7 +28,8 @@ classifiers = [ ] dependencies = [ - 'bokeh >=3.4.0,<3.5.0', + # 'bokeh >=3.5.0,<3.6.0', + 'bokeh ==3.5.0rc1', 'cartopy >=0.18.0', 'holoviews >=1.16.0', 'numpy', From 773894890a5200758daa4486ec620a3364d45e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Thu, 27 Jun 2024 08:52:05 +0200 Subject: [PATCH 2/7] Update deprecated Array to List --- geoviews/models/checkpoint_tool.ts | 4 ++-- geoviews/models/clear_tool.ts | 4 ++-- geoviews/models/restore_tool.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/geoviews/models/checkpoint_tool.ts b/geoviews/models/checkpoint_tool.ts index f3d8a1f9..bf2a4af8 100644 --- a/geoviews/models/checkpoint_tool.ts +++ b/geoviews/models/checkpoint_tool.ts @@ -55,8 +55,8 @@ export class CheckpointTool extends ActionTool { static { this.prototype.default_view = CheckpointToolView - this.define(({Array, Ref}) => ({ - sources: [ Array(Ref(ColumnDataSource)), [] ], + this.define(({List, Ref}) => ({ + sources: [ List(Ref(ColumnDataSource)), [] ], })) } diff --git a/geoviews/models/clear_tool.ts b/geoviews/models/clear_tool.ts index 6d44bec9..5aafc83b 100644 --- a/geoviews/models/clear_tool.ts +++ b/geoviews/models/clear_tool.ts @@ -34,8 +34,8 @@ export class ClearTool extends ActionTool { static { this.prototype.default_view = ClearToolView - this.define(({Array, Ref}) => ({ - sources: [ Array(Ref(ColumnDataSource)), [] ], + this.define(({List, Ref}) => ({ + sources: [ List(Ref(ColumnDataSource)), [] ], })) } diff --git a/geoviews/models/restore_tool.ts b/geoviews/models/restore_tool.ts index 1a29efbf..ed653e81 100644 --- a/geoviews/models/restore_tool.ts +++ b/geoviews/models/restore_tool.ts @@ -44,8 +44,8 @@ export class RestoreTool extends ActionTool { static { this.prototype.default_view = RestoreToolView - this.define(({Array, Ref}) => ({ - sources: [ Array(Ref(ColumnDataSource)), [] ], + this.define(({List, Ref}) => ({ + sources: [ List(Ref(ColumnDataSource)), [] ], })) } From 1d498b99a6d42b6266b17b7375820944d3045165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Thu, 27 Jun 2024 08:57:23 +0200 Subject: [PATCH 3/7] Add bokeh/label/dev channel --- pixi.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi.toml b/pixi.toml index 9f318590..673c1d1e 100644 --- a/pixi.toml +++ b/pixi.toml @@ -1,6 +1,6 @@ [project] name = "geoviews" -channels = ["pyviz/label/dev", "conda-forge"] +channels = ["pyviz/label/dev", "bokeh/label/dev", "conda-forge"] platforms = ["linux-64", "osx-arm64", "osx-64", "win-64"] [tasks] From 7a978ec05d8ab6eb0f5bd1723389fba13bf8ccfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Thu, 27 Jun 2024 09:02:35 +0200 Subject: [PATCH 4/7] Add bokeh_sampledata to examples --- pixi.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pixi.toml b/pixi.toml index 673c1d1e..7c433d1c 100644 --- a/pixi.toml +++ b/pixi.toml @@ -47,6 +47,7 @@ python = "3.11.*" python = "3.12.*" [feature.example.dependencies] +bokeh_sampledata = "*" datashader = "*" fiona = "*" geopandas-base = "*" From 24db07d79c4609f35e4a7abac6e46c7280334682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Thu, 27 Jun 2024 09:13:59 +0200 Subject: [PATCH 5/7] Remove bokeh sampledata from download data --- scripts/download_data.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/download_data.py b/scripts/download_data.py index eed4971b..77511056 100644 --- a/scripts/download_data.py +++ b/scripts/download_data.py @@ -1,11 +1,8 @@ from contextlib import suppress from pathlib import Path -import bokeh.sampledata - BASE_PATH = Path(__file__).resolve().parents[1] -bokeh.sampledata.download() with suppress(ImportError): import pyct.cmd From 8e30d5a49bb866a75c797758168d75fae2d00d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Thu, 27 Jun 2024 09:31:17 +0200 Subject: [PATCH 6/7] Remove rc version to wait for official release --- pixi.toml | 5 ++--- pyproject.toml | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pixi.toml b/pixi.toml index 7c433d1c..168de156 100644 --- a/pixi.toml +++ b/pixi.toml @@ -1,6 +1,6 @@ [project] name = "geoviews" -channels = ["pyviz/label/dev", "bokeh/label/dev", "conda-forge"] +channels = ["pyviz/label/dev", "conda-forge"] platforms = ["linux-64", "osx-arm64", "osx-64", "win-64"] [tasks] @@ -23,8 +23,7 @@ lint = ["py311", "lint"] download-data = ["download-data"] [dependencies] -# bokeh = "3.5.*" -bokeh = "3.5.0rc1" +bokeh = "3.5.*" cartopy = ">=0.18.0" holoviews = ">=1.16.0" nodejs = "*" diff --git a/pyproject.toml b/pyproject.toml index 813c739a..ed29d8da 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,5 @@ [build-system] -# requires = ["hatchling", "hatch-vcs", 'bokeh ==3.5'] -requires = ["hatchling", "hatch-vcs", 'bokeh ==3.5.0rc1'] +requires = ["hatchling", "hatch-vcs", 'bokeh ==3.5'] build-backend = "hatchling.build" [project] @@ -28,8 +27,7 @@ classifiers = [ ] dependencies = [ - # 'bokeh >=3.5.0,<3.6.0', - 'bokeh ==3.5.0rc1', + 'bokeh >=3.5.0,<3.6.0', 'cartopy >=0.18.0', 'holoviews >=1.16.0', 'numpy', From 198453ef1572ee4e34c36a8388ca57801ff1e685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Mon, 29 Jul 2024 14:16:23 +0200 Subject: [PATCH 7/7] Update pin for nodejs --- pixi.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi.toml b/pixi.toml index 168de156..f0c4e05d 100644 --- a/pixi.toml +++ b/pixi.toml @@ -26,7 +26,7 @@ download-data = ["download-data"] bokeh = "3.5.*" cartopy = ">=0.18.0" holoviews = ">=1.16.0" -nodejs = "*" +nodejs = ">=20" numpy = "*" packaging = "*" panel = ">=1.0.0"