Merge remote-tracking branch 'upstream/main' into delayed-partition-v3

.github/workflows/conda.yml

@@ -30,7 +30,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up Python
-        uses: conda-incubator/[email protected].0
+        uses: conda-incubator/[email protected].1
         with:
           miniforge-variant: Mambaforge
           use-mamba: true

.github/workflows/test-report.yaml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/[email protected]
 
       - name: Setup Conda Environment
-        uses: conda-incubator/[email protected].0
+        uses: conda-incubator/[email protected].1
         with:
           miniforge-variant: Mambaforge
           miniforge-version: latest
@@ -56,7 +56,7 @@ jobs:
           mv test_report.html test_short_report.html deploy/
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.4.3
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           branch: gh-pages
           folder: deploy

.github/workflows/tests.yaml

@@ -114,7 +114,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Conda Environment
-        uses: conda-incubator/[email protected].0
+        uses: conda-incubator/[email protected].1
         with:
           miniforge-variant: Mambaforge
           miniforge-version: latest

distributed/dashboard/core.py

@@ -6,8 +6,8 @@
 from bokeh.application import Application
 from bokeh.application.handlers.function import FunctionHandler
 from bokeh.resources import Resources
-from bokeh.server.server import BokehTornado
 from bokeh.server.util import create_hosts_allowlist
+from packaging.version import parse as parse_version
 
 import dask
 
@@ -32,9 +32,14 @@
     from bokeh.models import TabPanel  # noqa: F401
 
 
-class DaskBokehTornado(BokehTornado):
-    def resources(self, absolute_url: str | bool | None = True) -> Resources:
-        return super().resources(absolute_url)
+if BOKEH_VERSION < parse_version("3.3.0"):
+    from bokeh.server.server import BokehTornado as DaskBokehTornado
+else:
+    from bokeh.server.server import BokehTornado
+
+    class DaskBokehTornado(BokehTornado):  # type: ignore[no-redef]
+        def resources(self, absolute_url: str | bool | None = True) -> Resources:
+            return super().resources(absolute_url)
 
 
 def BokehApplication(applications, server, prefix="/", template_variables=None):

pyproject.toml

@@ -28,7 +28,7 @@ requires-python = ">=3.9"
 dependencies = [
     "click >= 8.0",
     "cloudpickle >= 1.5.0",
-    "dask == 2023.11.0",
+    "dask == 2023.12.0",
     "jinja2 >= 2.10.3",
     "locket >= 1.0.0",
     "msgpack >= 1.0.0",