Support for Bokeh 3.4

.github/workflows/test.yaml

@@ -52,7 +52,7 @@ jobs:
         with:
           name: unit_test_suite
           python-version: ${{ matrix.python-version }}
-          channels: pyviz/label/dev,numba,bokeh,conda-forge,nodefaults
+          channels: pyviz/label/dev,numba,bokeh/label/dev,conda-forge,nodefaults
           conda-update: true
           nodejs: true
           envs: -o examples -o recommended -o tests -o build
@@ -142,7 +142,7 @@ jobs:
         with:
           name: ui_test_suite
           python-version: 3.9
-          channels: pyviz/label/dev,bokeh,conda-forge,nodefaults
+          channels: pyviz/label/dev,bokeh/label/dev,conda-forge,nodefaults
           envs: "-o recommended -o tests -o build"
           cache: true
           nodejs: true

panel/io/resources.py

@@ -393,6 +393,8 @@ def bundle_resources(roots, resources, notebook=False, reloading=False, enable_m
     elif mode == "server":
         for bundle in extensions:
             server_url = bundle.server_url
+            if not isinstance(server_url, str):  # Bokeh 3.4.0.dev4 uses bokeh.embed.bundle.URL
+                server_url = server_url.url
             if resources.root_url and not resources.absolute:
                 server_url = server_url.replace(resources.root_url, '', 1)
                 if state.rel_path:
@@ -600,6 +602,8 @@ def adjust_paths(self, resources):
         new_resources = []
         cdn_base = f'{config.npm_cdn}/@holoviz/panel@{JS_VERSION}/dist/'
         for resource in resources:
+            if not isinstance(resource, str):  # Bokeh 3.4.0.dev4 uses bokeh.embed.bundle.URL
+                resource = resource.url
             resource = resource.replace('https://unpkg.com', config.npm_cdn)
             if resource.startswith(cdn_base):
                 resource = resource.replace(cdn_base, CDN_DIST)

panel/models/index.ts

@@ -6,7 +6,7 @@ export {Card} from "./card"
 export {CheckboxButtonGroup} from "./checkbox_button_group"
 export {Column} from "./column"
 export {CommManager} from "./comm_manager"
-export {CustomSelect} from "./customselect"
+// export {CustomSelect} from "./customselect"
 export {DataTabulator} from "./tabulator"
 export {DatetimePicker} from "./datetime_picker"
 export {DeckGLPlot} from "./deckgl"

panel/package.json

@@ -8,7 +8,7 @@
     "url": "https://github.com/holoviz/panel.git"
   },
   "dependencies": {
-    "@bokeh/bokehjs": "~3.3.1",
+    "@bokeh/bokehjs": "~3.4.0.dev4",
     "@luma.gl/constants": "^8.0.3",
     "@types/debounce": "^1.2.0",
     "@types/gl-matrix": "^2.4.5",

panel/tests/io/test_resources.py

@@ -2,18 +2,19 @@
 
 from pathlib import Path
 
+import bokeh
+
 from packaging.version import Version
 
 from panel.config import config, panel_extension as extension
-from panel.io.convert import BOKEH_VERSION
 from panel.io.resources import (
     CDN_DIST, DIST_DIR, PANEL_DIR, Resources, resolve_custom_path,
     set_resource_mode,
 )
 from panel.io.state import set_curdoc
 from panel.widgets import Button
 
-bokeh_version = Version(BOKEH_VERSION)
+bokeh_version = Version(bokeh.__version__)
 if bokeh_version.is_devrelease or bokeh_version.is_prerelease:
     bk_prefix = 'dev'
 else:
@@ -41,11 +42,11 @@ def test_resources_cdn():
     resources = Resources(mode='cdn', minified=True)
     assert resources.js_raw == ['Bokeh.set_log_level("info");']
     assert resources.js_files == [
-        f'https://cdn.bokeh.org/bokeh/{bk_prefix}/bokeh-{BOKEH_VERSION}.min.js',
-        f'https://cdn.bokeh.org/bokeh/{bk_prefix}/bokeh-gl-{BOKEH_VERSION}.min.js',
-        f'https://cdn.bokeh.org/bokeh/{bk_prefix}/bokeh-widgets-{BOKEH_VERSION}.min.js',
-        f'https://cdn.bokeh.org/bokeh/{bk_prefix}/bokeh-tables-{BOKEH_VERSION}.min.js',
-        f'https://cdn.bokeh.org/bokeh/{bk_prefix}/bokeh-mathjax-{BOKEH_VERSION}.min.js',
+        f'https://cdn.bokeh.org/bokeh/{bk_prefix}/bokeh-{bokeh_version}.min.js',
+        f'https://cdn.bokeh.org/bokeh/{bk_prefix}/bokeh-gl-{bokeh_version}.min.js',
+        f'https://cdn.bokeh.org/bokeh/{bk_prefix}/bokeh-widgets-{bokeh_version}.min.js',
+        f'https://cdn.bokeh.org/bokeh/{bk_prefix}/bokeh-tables-{bokeh_version}.min.js',
+        f'https://cdn.bokeh.org/bokeh/{bk_prefix}/bokeh-mathjax-{bokeh_version}.min.js',
     ]
 
 def test_resources_server_absolute():

panel/util/__init__.py

@@ -43,11 +43,12 @@
 
 log = logging.getLogger('panel.util')
 
-bokeh_version = Version(bokeh.__version__)
+bokeh_version = Version(Version(bokeh.__version__).base_version)
 
 # Bokeh serializes NaT as this value
 # Discussion on why https://github.com/bokeh/bokeh/pull/10449/files#r479988469
-BOKEH_JS_NAT = -9223372036854776.0
+# Improved in Bokeh 3.4: https://github.com/bokeh/bokeh/pull/13606
+BOKEH_JS_NAT = -9223372036854776.0 if bokeh_version < Version("3.4") else np.nan
 
 PARAM_NAME_PATTERN = re.compile(r'^.*\d{5}$')
 

pyproject.toml

@@ -3,7 +3,7 @@ requires = [
     "param >=2.0.0",
     "pyct >=0.4.4",
     "setuptools >=42",
-    "bokeh >=3.3.0,<3.4.0",
+    "bokeh ==3.4.0.dev4",
     "pyviz_comms >=0.7.4",
     "requests",
     "bleach",

setup.py

@@ -100,7 +100,7 @@ def run(self):
 ########## dependencies ##########
 
 install_requires = [
-    'bokeh >=3.2.0,<3.4.0',
+    'bokeh >=3.2.0,<3.5.0',
     'param >=2.0.0,<3.0',
     'pyviz_comms >=2.0.0',
     'xyzservices >=2021.09.1', # Bokeh dependency, but pyodide 23.0.0 does not always pick it up
@@ -234,7 +234,7 @@ def run(self):
     'setuptools >=42',
     'requests',
     'packaging',
-    'bokeh >=3.3.0,<3.4.0',
+    "bokeh ==3.4.0.dev4",
     'pyviz_comms >=2.0.0',
     'bleach',
     'markdown',