Update to Bokeh 3.2 and update CI (#664)

.github/workflows/build.yaml

@@ -50,6 +50,9 @@ jobs:
       - name: conda setup
         run: |
           conda config --set always_yes True
+          conda install -n base conda-libmamba-solver
+          conda install -n test conda-libmamba-solver
+          conda config --set solver libmamba
           conda install -c pyviz "pyctdev>=0.5"
           doit ecosystem_setup
           conda install -c conda-forge "urllib3<2.0.0" "conda-build==3.24"
@@ -78,6 +81,7 @@ jobs:
       - name: build js
         run: |
           eval "$(conda shell.bash hook)"
+          conda install -n test-environment conda-libmamba-solver
           conda activate test-environment
           doit develop_install $CHANS_DEV -o build
           python setup.py develop

.github/workflows/test.yaml

@@ -50,7 +50,7 @@ jobs:
       SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
       USE_PYGEOS: '0'
     steps:
-      - uses: holoviz-dev/holoviz_tasks/install@v0.1a14
+      - uses: holoviz-dev/holoviz_tasks/install@v0.1a15
         with:
           name: unit_test_suite
           python-version: ${{ matrix.python-version }}
@@ -59,13 +59,8 @@ jobs:
           envs: "-o tests -o examples_extra -o recommended"
           cache: true
           conda-update: true
-          conda-mamba: mamba
           nodejs: true
         id: install
-      - name: doit env_capture
-        run: |
-          conda activate test-environment
-          doit env_capture
       - name: download data
         run: |
           conda activate test-environment

geoviews/models/poly_edit.ts

@@ -31,7 +31,7 @@ export class PolyVertexEditToolView extends PolyEditToolView {
     if (this._basepoint == null || this.model.vertex_renderer == null)
       return
     const points = this._drag_points(ev, [this.model.vertex_renderer])
-    if (!ev.shift_key) {
+    if (!ev.modifiers.shift) {
       this._move_linked(points)
     }
     if (this._selected_renderer)
@@ -42,7 +42,7 @@ export class PolyVertexEditToolView extends PolyEditToolView {
     if (this._basepoint == null || this.model.vertex_renderer == null)
       return
     const points = this._drag_points(ev, [this.model.vertex_renderer])
-    if (!ev.shift_key) {
+    if (!ev.modifiers.shift) {
       this._move_linked(points)
     }
     this._emit_cds_changes(this.model.vertex_renderer.data_source, false, true, true)

geoviews/package.json

@@ -8,7 +8,7 @@
     "url": "https://github.com/holoviz/geoviews.git"
   },
   "dependencies": {
-    "@bokeh/bokehjs": "~3.1.1"
+    "@bokeh/bokehjs": "~3.2.1"
   },
   "devDependencies": {},
   "files": [

pyproject.toml

@@ -2,7 +2,7 @@
 requires = [
     "param >=1.9.0",
     "pyct >=0.4.4",
-    "bokeh >=3.1.0,<3.2.0",
+    "bokeh >=3.1.0,<3.3.0",
     "pyviz_comms >=0.6.0",
     "setuptools",
 ]

setup.cfg

@@ -4,3 +4,4 @@ license_files = LICENSE
 [tool:pyctdev.conda]
 namespace_map =
     geopandas=geopandas-base
+    matplotlib=matplotlib-base

setup.py

@@ -94,7 +94,7 @@ def run(self):
 ### dependencies ###
 
 _required = [
-    'bokeh >=3.1.0,<3.2.0',
+    'bokeh >=3.1.0,<3.3.0',
     'cartopy >=0.18.0',
     'holoviews >=1.16.0',
     'packaging',
@@ -110,7 +110,6 @@ def run(self):
     # geopandas-base installed with conda, see setup.cfg
     'geopandas',
     'netcdf4',
-    'jupyter',
     'matplotlib >2.2',
     'pandas',
     'pyct',
@@ -130,11 +129,16 @@ def run(self):
     'geodatasets',
 ]
 
+if sys.version_info[:2] == (3, 8):
+    _examples_extra += [
+        "iris ==3.5"  # Hard pin for Windows + Python 3.8
+    ]
+
 extras_require={
     'recommended': _recommended,
     'examples_extra': _examples_extra,
     'doc': _examples_extra + [
-        'nbsite ==0.8.0',
+        'nbsite >=0.8.2,<0.9.0',
         'cartopy >=0.20.0',
         'graphviz',
         'lxml',
@@ -159,8 +163,8 @@ def run(self):
 extras_require['build'] = [
     'param >=1.9.2',
     'pyct >=0.4.4',
-    'bokeh >=3.1.0,<3.2.0',
-    'pyviz_comms >=0.6.0'
+    'bokeh >=3.1.0,<3.3.0',
+    'pyviz_comms >=0.6.0',
 ]
 
 ########################