diff --git a/examples/conftest.py b/examples/conftest.py new file mode 100644 index 000000000..3f738cc33 --- /dev/null +++ b/examples/conftest.py @@ -0,0 +1,14 @@ +import holoviews as hv + +from packaging.version import Version + + +collect_ignore_glob = [] + + +# 2023-10: https://github.com/holoviz/hvplot/pull/1164 +if Version(hv.__version__) == Version("1.18.0a4"): + collect_ignore_glob += [ + "reference/xarray/contourf.ipynb", + "user_guide/Geographic_Data.ipynb", + ] diff --git a/hvplot/tests/testinteractive.py b/hvplot/tests/testinteractive.py index 25607ff87..c06799305 100644 --- a/hvplot/tests/testinteractive.py +++ b/hvplot/tests/testinteractive.py @@ -14,7 +14,7 @@ from hvplot import bind from hvplot.interactive import Interactive from hvplot.xarray import XArrayInteractive -from hvplot.util import bokeh3 +from hvplot.util import bokeh3, param2 is_bokeh2 = pytest.mark.skipif(bokeh3, reason="requires bokeh 2.x") is_bokeh3 = pytest.mark.skipif(not bokeh3, reason="requires bokeh 3.x") @@ -1382,7 +1382,10 @@ def test_interactive_pandas_series_widget_value(series): assert isinstance(si._current, pd.DataFrame) pd.testing.assert_series_equal(si._current.A, series + w.value) assert si._obj is series - assert "dim('*').pd+= Version("3.0") +param2 = Version(param.__version__) >= Version("2.0rc4") def with_hv_extension(func, extension='bokeh', logo=False):