Skip to content

Commit 4722c69

Browse files
committed
Merge branch 'main' into mpl_heatmap-6644
2 parents ae58e4d + 2dfe271 commit 4722c69

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

holoviews/tests/plotting/bokeh/test_server.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from holoviews.plotting import Renderer
1919
from holoviews.plotting.bokeh.callbacks import Callback, RangeXYCallback, ResetCallback
2020
from holoviews.plotting.bokeh.renderer import BokehRenderer
21+
from holoviews.plotting.bokeh.util import BOKEH_GE_3_8_0
2122
from holoviews.streams import PlotReset, RangeXY, Stream
2223

2324
bokeh_renderer = BokehRenderer.instance(mode='server')
@@ -48,8 +49,12 @@ def tearDown(self):
4849
def test_render_server_doc_element(self):
4950
obj = Curve([])
5051
doc = bokeh_renderer.server_doc(obj)
51-
self.assertIs(doc, curdoc())
52-
self.assertIs(bokeh_renderer.last_plot.document, curdoc())
52+
if not BOKEH_GE_3_8_0:
53+
# Updating the config which is introduced in Bokeh 3.8 changes the curdoc()
54+
# Something like this is done in Panel:
55+
# curdoc().config.update(notifications=None)
56+
assert doc == curdoc()
57+
assert bokeh_renderer.last_plot.document == doc
5358

5459
def test_render_explicit_server_doc_element(self):
5560
obj = Curve([])

pixi.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ features = ["required", "py313", "optional", "test-core", "test-example", "test-
3333
no-default-feature = true
3434

3535
[environments.test-ui]
36-
features = ["required", "py312", "optional", "test-core", "test-ui"]
36+
features = ["required", "py313", "optional", "test-core", "test-ui"]
3737
no-default-feature = true
3838

3939
[environments.test-core]
@@ -114,7 +114,7 @@ pillow = "*"
114114
plotly = ">=4.0"
115115
pooch = "*"
116116
pyarrow = "*"
117-
pyparsing = "!=3.2.2" # Pinned 2025-03
117+
pyparsing = "*"
118118
scikit-image = "*"
119119
scipy = "*"
120120
selenium = "*"
@@ -144,7 +144,7 @@ pytest = "*"
144144
pytest-asyncio = "*"
145145
pytest-cov = "*"
146146
pytest-github-actions-annotate-failures = "*"
147-
pytest-rerunfailures = "*"
147+
pytest-rerunfailures = "!=16.0.0" # https://github.com/pytest-dev/pytest-rerunfailures/issues/303
148148
pytest-xdist = "*"
149149

150150
[feature.test-unit-task.tasks] # So it is not showing up in the test-gpu + test-ui environment
@@ -160,7 +160,7 @@ nbval = "*"
160160
channels = ["microsoft"]
161161

162162
[feature.test-ui.dependencies]
163-
playwright = { version = "!=1.51.0", channel = "microsoft" } # https://github.com/microsoft/playwright-python/issues/2791
163+
playwright = { version = "*", channel = "microsoft" }
164164
pytest-playwright = { version = "*", channel = "microsoft" }
165165

166166
[feature.test-ui.tasks]

0 commit comments

Comments
 (0)