diff --git a/panel/package-lock.json b/panel/package-lock.json index 300770e300..571c15a5be 100644 --- a/panel/package-lock.json +++ b/panel/package-lock.json @@ -9,7 +9,7 @@ "version": "1.5.0-a.6", "license": "BSD-3-Clause", "dependencies": { - "@bokeh/bokehjs": "3.5.0-dev.8", + "@bokeh/bokehjs": "3.5.0-rc.1", "@types/debounce": "^1.2.0", "@types/gl-matrix": "^2.4.5", "ace-code": "^1.24.1", @@ -41,9 +41,9 @@ } }, "node_modules/@bokeh/bokehjs": { - "version": "3.5.0-dev.8", - "resolved": "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-3.5.0-dev.8.tgz", - "integrity": "sha512-n0c2/SPex3xpMoX5lqRwr0OY2bkvqihc0Ds9RbKP6F6p/JiVf5IhosmZ4anNiJAVJJsfOxzXfKdNRjIG4zNqKQ==", + "version": "3.5.0-rc.1", + "resolved": "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-3.5.0-rc.1.tgz", + "integrity": "sha512-WOUBY6ILHRUESxB24BpYqvaHym73CaqWRNskzWwb1p9QgnLwtJwhL7ibtREg/fuO+ifTpfCDoKSHaP3jmbflyQ==", "workspaces": [ "./make", "./src/compiler", diff --git a/panel/package.json b/panel/package.json index d244fecdbb..bf460f28ed 100644 --- a/panel/package.json +++ b/panel/package.json @@ -8,7 +8,7 @@ "url": "https://github.com/holoviz/panel.git" }, "dependencies": { - "@bokeh/bokehjs": "3.5.0-dev.8", + "@bokeh/bokehjs": "3.5.0-rc.1", "@types/debounce": "^1.2.0", "@types/gl-matrix": "^2.4.5", "ace-code": "^1.24.1", diff --git a/panel/tests/conftest.py b/panel/tests/conftest.py index 37653a72cc..8126d69d70 100644 --- a/panel/tests/conftest.py +++ b/panel/tests/conftest.py @@ -402,6 +402,7 @@ def server_cleanup(): def cache_cleanup(): state.clear_caches() Design._resolve_modifiers.cache_clear() + state._stylesheets.clear() @pytest.fixture def autoreload(): diff --git a/panel/tests/test_param.py b/panel/tests/test_param.py index 0d57504afd..dfbe83245c 100644 --- a/panel/tests/test_param.py +++ b/panel/tests/test_param.py @@ -1792,7 +1792,7 @@ def function(value): root = pane.get_root(document, comm) - wait_until(lambda: root.children[0].text == '<p>False</p>\n') + wait_until(lambda: root.children[0].text == '<p>False</p>\n', timeout=10_000) checkbox.value = True @@ -1811,7 +1811,7 @@ def function(value): root = pane.get_root(document, comm) - wait_until(lambda: len(root.children) == 2) + wait_until(lambda: len(root.children) == 2, timeout=10_000) assert root.children[0].text == '<p>False</p>\n' assert root.children[1].text == '<p>True</p>\n' @@ -1866,6 +1866,7 @@ async def function(value): assert root.children[1].text == '<p>False</p>\n' +@pytest.mark.flaky(max_runs=3) def test_param_generator_multiple(document, comm): checkbox = Checkbox(value=False) @@ -1877,7 +1878,7 @@ def function(value): root = pane.get_root(document, comm) - wait_until(lambda: root.children[0].text == '<p>True</p>\n') + wait_until(lambda: root.children[0].text == '<p>True</p>\n', timeout=10_000) checkbox.value = True diff --git a/pixi.toml b/pixi.toml index 42e4b5db35..4785f0fa2a 100644 --- a/pixi.toml +++ b/pixi.toml @@ -22,7 +22,7 @@ lint = ["py311", "lint"] [dependencies] bleach = "*" -bokeh = "==3.5.0.dev8" +bokeh = "==3.5.0rc1" linkify-it-py = "*" markdown = "*" markdown-it-py = "*" diff --git a/pyproject.toml b/pyproject.toml index f694fd112a..1f6d76c395 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = [ "hatchling", "hatch-vcs", "param >=2.1.0", - "bokeh ==3.5.0.dev8", + "bokeh ==3.5.0rc1", "pyviz_comms >=0.7.4", "requests", "packaging", @@ -47,7 +47,7 @@ classifiers = [ ] dependencies = [ - 'bokeh ==3.5.0.dev8', + 'bokeh ==3.5.0rc1', 'param >=2.1.0,<3.0', 'pyviz_comms >=2.0.0', 'markdown',