diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index ad93ac3ba6..e63b180cb4 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -30,7 +30,7 @@ jobs: with: fetch-depth: 0 - name: Set up Python - uses: conda-incubator/setup-miniconda@v3.0.0 + uses: conda-incubator/setup-miniconda@v3.0.1 with: miniforge-variant: Mambaforge use-mamba: true diff --git a/.github/workflows/test-report.yaml b/.github/workflows/test-report.yaml index 4270f8cb70..46e93598b5 100644 --- a/.github/workflows/test-report.yaml +++ b/.github/workflows/test-report.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v4.1.1 - name: Setup Conda Environment - uses: conda-incubator/setup-miniconda@v3.0.0 + uses: conda-incubator/setup-miniconda@v3.0.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 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 4d7547318e..e3a1e702b1 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -114,7 +114,7 @@ jobs: fetch-depth: 0 - name: Setup Conda Environment - uses: conda-incubator/setup-miniconda@v3.0.0 + uses: conda-incubator/setup-miniconda@v3.0.1 with: miniforge-variant: Mambaforge miniforge-version: latest diff --git a/distributed/dashboard/core.py b/distributed/dashboard/core.py index c9017ef821..96211bb2ea 100644 --- a/distributed/dashboard/core.py +++ b/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): diff --git a/pyproject.toml b/pyproject.toml index af57c3a2e3..bae4d4d442 100644 --- a/pyproject.toml +++ b/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",