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)), [] ], })) } diff --git a/pixi.toml b/pixi.toml index c6b72971..f0c4e05d 100644 --- a/pixi.toml +++ b/pixi.toml @@ -23,10 +23,10 @@ lint = ["py311", "lint"] download-data = ["download-data"] [dependencies] -bokeh = ">=3.4.0,<3.5.0" +bokeh = "3.5.*" 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 = ">=20" numpy = "*" packaging = "*" panel = ">=1.0.0" @@ -46,6 +46,7 @@ python = "3.11.*" python = "3.12.*" [feature.example.dependencies] +bokeh_sampledata = "*" datashader = "*" fiona = "*" geopandas-base = "*" diff --git a/pyproject.toml b/pyproject.toml index 40625a1d..ed29d8da 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["hatchling", "hatch-vcs", 'bokeh ==3.4'] +requires = ["hatchling", "hatch-vcs", 'bokeh ==3.5'] build-backend = "hatchling.build" [project] @@ -27,7 +27,7 @@ classifiers = [ ] dependencies = [ - 'bokeh >=3.4.0,<3.5.0', + 'bokeh >=3.5.0,<3.6.0', 'cartopy >=0.18.0', 'holoviews >=1.16.0', 'numpy', 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