Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow bokeh=3 #5648

Merged
merged 20 commits into from
Nov 15, 2022
Merged

Allow bokeh=3 #5648

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3d192fb
Use development version of bokeh in CI
jrbourbeau Jan 7, 2022
5e9b9b3
Merge branch 'main' of https://github.com/dask/distributed into dev-b…
jrbourbeau Jan 10, 2022
6436877
Merge branch 'main' of https://github.com/dask/distributed into dev-b…
jrbourbeau Oct 21, 2022
45477f7
More versions
jrbourbeau Oct 21, 2022
46dbafe
Panel / TabPanel compat
jrbourbeau Oct 21, 2022
1db6c2f
Make GHA yaml valid?
jrbourbeau Oct 21, 2022
7b1056c
id and Div compat
jrbourbeau Oct 24, 2022
0811fec
CDSView filter
jrbourbeau Oct 24, 2022
8d8f5f3
Div style
jrbourbeau Oct 24, 2022
b98f706
Lingering id
jrbourbeau Oct 24, 2022
3e51931
Remove ids
jrbourbeau Oct 26, 2022
39d3a89
Handle DataTable CSS
jrbourbeau Oct 27, 2022
7192b2b
Merge branch 'main' of https://github.com/dask/distributed into dev-b…
jrbourbeau Oct 28, 2022
97fc007
Merge branch 'main' of https://github.com/dask/distributed into dev-b…
jrbourbeau Nov 8, 2022
dee0277
Install old bokeh in CI to check backwards compatibility
jrbourbeau Nov 8, 2022
7c9477b
Remove bokeh version upper bound
jrbourbeau Nov 8, 2022
3bc45cc
Update env file
jrbourbeau Nov 14, 2022
6dd05a4
Try importlib.metadata workaround for distributed/tests/test_init.py
jrbourbeau Nov 14, 2022
be63adb
Try bokeh=3.0.2
jrbourbeau Nov 14, 2022
b38f6d9
Remove temporary pip install
jrbourbeau Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@ jobs:
run: mamba env update -n dask-distributed -f ${{ env.CONDA_FILE }}
if: steps.skip-caching.outputs.trigger-found == 'true' || steps.cache.outputs.cache-hit != 'true'

- name: Install old bokeh
if: matrix.python-version == '3.9'
shell: bash -l {0}
run: |
conda uninstall --force bokeh
mamba install -c conda-forge bokeh<3

- name: Install
shell: bash -l {0}
run: |
Expand Down
3 changes: 1 addition & 2 deletions continuous_integration/environment-3.10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ dependencies:
- packaging
- pip
- asyncssh
# Temporary restriction until https://github.com/dask/distributed/issues/7173 is resolved
- bokeh<3
- bokeh
- click
- cloudpickle
- coverage
Expand Down
3 changes: 1 addition & 2 deletions continuous_integration/environment-3.8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ dependencies:
- packaging
- pip
- asyncssh
# Temporary restriction until https://github.com/dask/distributed/issues/7173 is resolved
- bokeh<3
- bokeh
- click
- cloudpickle
- coverage
Expand Down
3 changes: 1 addition & 2 deletions continuous_integration/environment-3.9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ dependencies:
- packaging
- pip
- asyncssh
# Temporary restriction until https://github.com/dask/distributed/issues/7173 is resolved
- bokeh<3
- bokeh
- click
- cloudpickle
- coverage
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/recipes/dask/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ requirements:
- lz4
- numpy >=1.18
- pandas >=1.0
- bokeh >=2.4.2,<3
- bokeh >=2.4.2
- jinja2

run_constrained:
Expand Down
2 changes: 0 additions & 2 deletions distributed/dashboard/components/nvml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ def __init__(self, scheduler, width=600, **kwargs):
memory = figure(
title="GPU Memory",
tools="",
id="bk-gpu-memory-worker-plot",
width=int(width / 2),
name="gpu_memory_histogram",
**kwargs,
Expand All @@ -64,7 +63,6 @@ def __init__(self, scheduler, width=600, **kwargs):
utilization = figure(
title="GPU Utilization",
tools="",
id="bk-gpu-utilization-worker-plot",
width=int(width / 2),
name="gpu_utilization_histogram",
**kwargs,
Expand Down