Partially revert "Allow bokeh=3 (dask#5648)"

This reverts commit d4adb3a. Leaving all code changes, just: * reinstating the `< 3` version restriction * including `< 3` in error messages
gjoseph92 · Nov 17, 2022 · 04acbff · 04acbff
1 parent 69b74f9
commit 04acbff
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/continuous_integration/environment-3.10.yaml b/continuous_integration/environment-3.10.yaml
@@ -7,7 +7,8 @@ dependencies:
   - packaging
   - pip
   - asyncssh
-  - bokeh
+  # Temporary restriction until https://github.com/dask/distributed/issues/7173 is resolved
+  - bokeh<3
   - click
   - cloudpickle
   - coverage

diff --git a/continuous_integration/environment-3.8.yaml b/continuous_integration/environment-3.8.yaml
@@ -7,7 +7,8 @@ dependencies:
   - packaging
   - pip
   - asyncssh
-  - bokeh < 3 # Only tested here
+  # Temporary restriction until https://github.com/dask/distributed/issues/7173 is resolved
+  - bokeh<3
   - click
   - cloudpickle
   - coverage

diff --git a/continuous_integration/environment-3.9.yaml b/continuous_integration/environment-3.9.yaml
@@ -8,7 +8,8 @@ dependencies:
   - packaging
   - pip
   - asyncssh
-  - bokeh
+  # Temporary restriction until https://github.com/dask/distributed/issues/7173 is resolved
+  - bokeh<3
   - click
   - cloudpickle
   - coverage

diff --git a/continuous_integration/recipes/dask/meta.yaml b/continuous_integration/recipes/dask/meta.yaml
@@ -29,7 +29,7 @@ requirements:
     - lz4
     - numpy >=1.18
     - pandas >=1.0
-    - bokeh >=2.4.2
+    - bokeh >=2.4.2,<3
     - jinja2
 
   run_constrained:

diff --git a/distributed/dashboard/core.py b/distributed/dashboard/core.py
@@ -16,10 +16,10 @@
 
 if BOKEH_VERSION < parse_version(MIN_BOKEH_VERSION):
     warnings.warn(
-        f"\nDask needs bokeh >= {MIN_BOKEH_VERSION} for the dashboard."
+        f"\nDask needs bokeh >= {MIN_BOKEH_VERSION}, < 3 for the dashboard."
         "\nContinuing without the dashboard."
     )
-    raise ImportError(f"Dask needs bokeh >= {MIN_BOKEH_VERSION}")
+    raise ImportError(f"Dask needs bokeh >= {MIN_BOKEH_VERSION}, < 3")
 
 
 if BOKEH_VERSION.major < 3:

diff --git a/distributed/http/scheduler/missing_bokeh.py b/distributed/http/scheduler/missing_bokeh.py
@@ -9,9 +9,9 @@ class MissingBokeh(RequestHandler):
     @log_errors
     def get(self):
         self.write(
-            f"<p>Dask needs bokeh >= {MIN_BOKEH_VERSION} for the dashboard.</p>"
-            f"<p>Install with conda: conda install bokeh>={MIN_BOKEH_VERSION}</p>"
-            f"<p>Install with pip: pip install bokeh>={MIN_BOKEH_VERSION}</p>"
+            f"<p>Dask needs bokeh >= {MIN_BOKEH_VERSION}, < 3 for the dashboard.</p>"
+            f"<p>Install with conda: conda install bokeh>={MIN_BOKEH_VERSION},<3</p>"
+            f"<p>Install with pip: pip install bokeh>={MIN_BOKEH_VERSION},<3</p>"
         )