Merge branch 'main' into add_subcoordy_api

holoviz · Aug 5, 2024 · e551793 · e551793
2 parents 4fb716f + bca5ec2
commit e551793
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 5 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -50,8 +50,6 @@ jobs:
         run: |
           echo "Deploying from ref ${GITHUB_REF#refs/*/}"
           echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
-      - name: bokeh sampledata
-        run: bokeh sampledata
       - name: install dev nbsite
         run: pip install --pre -U nbsite
       - name: conda info
@@ -115,8 +113,6 @@ jobs:
         run: |
           echo "Deploying from ref ${GITHUB_REF#refs/*/}"
           echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
-      - name: bokeh sampledata
-        run: bokeh sampledata
       - name: build docs
         run: sphinx-build -b html doc builtdocs
       - name: report failure

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -132,6 +132,7 @@ jobs:
       - name: conda list
         run: conda list
       - name: bokeh sampledata
+        if: ${{ matrix.python-version == '3.9'}}
         run: bokeh sampledata
       - name: unit tests
         run: pytest -v hvplot --cov=hvplot --cov-append
@@ -162,6 +163,7 @@ jobs:
       - name: pip list
         run: pip list
       - name: bokeh sampledata
+        if: ${{ matrix.python-version == '3.9'}}
         run: bokeh sampledata
       - name: unit tests
         run: pytest -v hvplot --cov=hvplot --cov-append

diff --git a/doc/conftest.py b/doc/conftest.py
@@ -1,7 +1,11 @@
-import dask
 from importlib.util import find_spec
+
+import dask
+
+from packaging.version import Version
 from bokeh.io.webdriver import webdriver_control
 
+
 collect_ignore_glob = [
     'user_guide/Streaming.ipynb',
 ]
@@ -45,3 +49,19 @@
 # From Dask 2024.3.0 they now use `dask_expr` by default
 # https://github.com/dask/dask/issues/10995
 dask.config.set({'dataframe.query-planning': False})
+
+
+# https://github.com/pydata/xarray/pull/9182
+try:
+    import xarray as xr
+except ImportError:
+    pass
+else:
+    import numpy as np
+
+    if Version(np.__version__) >= Version('2.0.0') and Version(xr.__version__) <= Version(
+        '2024.6.0'
+    ):
+        collect_ignore_glob += [
+            'user_guide/Gridded_Data.ipynb',
+        ]
diff --git a/doc/reference/pandas/paths.ipynb → doc/reference/tabular/paths.ipynb b/doc/reference/pandas/paths.ipynb → doc/reference/tabular/paths.ipynb
diff --git a/envs/py3.10-tests.yaml b/envs/py3.10-tests.yaml
@@ -15,6 +15,7 @@ channels:
 dependencies:
   - python=3.10
   - bokeh>=3.1
+  - bokeh_sampledata
   - cartopy
   - colorcet>=2
   - dask

diff --git a/envs/py3.11-docs.yaml b/envs/py3.11-docs.yaml
@@ -15,6 +15,7 @@ channels:
 dependencies:
   - python=3.11
   - bokeh>=3.1
+  - bokeh_sampledata
   - cartopy
   - colorcet>=2
   - dask>=2021.3.0

diff --git a/envs/py3.11-tests.yaml b/envs/py3.11-tests.yaml
@@ -15,6 +15,7 @@ channels:
 dependencies:
   - python=3.11
   - bokeh>=3.1
+  - bokeh_sampledata
   - cartopy
   - colorcet>=2
   - dask

diff --git a/envs/py3.12-tests.yaml b/envs/py3.12-tests.yaml
@@ -15,6 +15,7 @@ channels:
 dependencies:
   - python=3.12
   - bokeh>=3.1
+  - bokeh_sampledata
   - cartopy
   - colorcet>=2
   - dask

diff --git a/pyproject.toml b/pyproject.toml
@@ -65,6 +65,7 @@ tests-core = [
     "ruff",
     "scipy",
     "xarray",
+    "bokeh_sampledata; python_version >= '3.10'",
 ]
 # Optional tests dependencies, i.e. one should be able
 # to run and pass the test suite without installing any
@@ -126,6 +127,7 @@ examples = [
     "xarray >=0.18.2",
     "xyzservices >=2022.9.0",
     "geodatasets >=2023.12.0",
+    "bokeh_sampledata; python_version >= '3.10'",
 ]
 tests-nb = [
     "pytest-xdist",