Merge branch 'main' into pop-queue-on-secede

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

continuous_integration/environment-3.8.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

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

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:

distributed/dashboard/core.py

@@ -3,7 +3,6 @@
 import functools
 import warnings
 
-import bokeh
 from bokeh.application import Application
 from bokeh.application.handlers.function import FunctionHandler
 from bokeh.server.server import BokehTornado
@@ -12,14 +11,16 @@
 
 import dask
 
+from distributed.dashboard.utils import BOKEH_VERSION
+
 _min_bokeh_version = "2.1.1"
 
-if parse_version(bokeh.__version__) < parse_version(_min_bokeh_version):
+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")
 
 
 def BokehApplication(applications, server, prefix="/", template_variables=None):

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>"
         )
 
 

docs/source/changelog.rst

@@ -1,6 +1,64 @@
 Changelog
 =========
 
+.. _v2022.10.1:
+
+2022.10.1
+---------
+
+Released on October 28, 2022
+
+New Features
+^^^^^^^^^^^^
+- Add ``Client.restart_workers`` method (:pr:`7154`) `James Bourbeau`_
+- Implement ``PackageInstall`` plugin for ``pip`` and ``conda`` (:pr:`7126`) `Hendrik Makait`_
+
+Enhancements
+^^^^^^^^^^^^
+- Add prometheus collector for work-stealing (:pr:`7206`) `Hendrik Makait`_
+- Track reason of workers closing and restarting (:pr:`7166`) `Hendrik Makait`_
+- Show no-worker on task progress bar (:pr:`7171`) `Florian Jetter`_
+- Set ``OPENBLAS_NUM_THREADS`` by default (:pr:`7177`) `James Bourbeau`_
+- Optionally provide local directory to data constructor (:pr:`7153`) `Lawrence Mitchell`_
+- Introduce ``distributed.comm.ucx.environment`` config slot (:pr:`7164`) `Lawrence Mitchell`_
+- Log information about memory limit (:pr:`7160`) `Florian Jetter`_
+- Improve log messages on scheduler for restart (:pr:`7150`) `Florian Jetter`_
+- More comprehensive ``WorkerState`` task counters (:pr:`7167`) `crusaderky`_
+
+Documentation
+^^^^^^^^^^^^^
+- Add note to changelog about new CLI (:pr:`7178`) `James Bourbeau`_
+- Update AMM docs (:pr:`7158`) `Benjamin Zaitlen`_
+- Add ``CondaInstall`` to plugins doc (:pr:`7149`) `James Bourbeau`_
+
+Bug Fixes
+^^^^^^^^^
+- Update minimum ``bokeh`` version message (:pr:`7172`) `James Bourbeau`_
+- Revamped implementations of remote ``print()`` and ``warn()``, fixing #7095 (:pr:`7129`) `Max Bane`_
+
+Maintenance
+^^^^^^^^^^^
+- Temporarily restrict ``bokeh<3`` (:pr:`7219`) `James Bourbeau`_
+- Make ``Scheduler.reschedule`` private (:pr:`7216`) `crusaderky`_
+- Fix ``decide_worker_rootish_queuing_disabled`` assert (:pr:`7065`) `Gabe Joseph`_
+- Fix flaky ``test_include_communication_in_occupancy`` (:pr:`7212`) `Gabe Joseph`_
+- Do not raise on leaked websockets (:pr:`7199`) `Florian Jetter`_
+- Update nightly recipes with CLI tests, dependency changes (:pr:`7201`) `Charles Blackmon-Luca`_
+- Make ``p2p`` shuffle submodules private (:pr:`7186`) `Florian Jetter`_
+- Backport tornado ``PeriodicCallback`` (:pr:`7165`) `Florian Jetter`_
+- Fix ``mypy`` failure on CI (:pr:`7198`) `Florian Jetter`_
+- User a layer for ``p2p`` shuffle (:pr:`7180`) `Florian Jetter`_
+- Type annotations for shuffle (:pr:`7185`) `Florian Jetter`_
+- Do not close worker on comm error in heartbeat (:pr:`7163`) `Hendrik Makait`_
+- Errors when setting TCP timeouts log as error (:pr:`7161`) `Florian Jetter`_
+- Remove incorrect advice from ``pre-commit`` config (:pr:`7159`) `crusaderky`_
+- Bump ``the-coding-turtle/ga-yaml-parser`` from 0.1.1 to 0.1.2 (:pr:`7146`)
+- Bump ``JamesIves/github-pages-deploy-action`` from 4.1.7 to 4.4.1 (:pr:`7145`)
+- Use functionalities network for codecov uploader (:pr:`7148`) `Florian Jetter`_
+- Use counter metric type where appropriate, ``incoming_count`` was reporting bytes (:pr:`7125`) `Nat Tabris`_
+
+
+
 .. _v2022.10.0:
 
 2022.10.0
@@ -4287,4 +4345,5 @@ significantly without many new features.
 .. _`Samantha Hughes`: https://github.com/shughes-uk
 .. _`Graham Markall`: https://github.com/gmarkall
 .. _`Nat Tabris`: https://github.com/ntabris
-.. _`Burt Holzman`: https://github.com/holzman
+.. _`Burt Holzman`: https://github.com/holzman
+.. _`Max Bane`: https://github.com/maxbane

requirements.txt

@@ -1,6 +1,6 @@
 click >= 6.6
 cloudpickle >= 1.5.0
-dask == 2022.10.0
+dask == 2022.10.1
 jinja2
 locket >= 1.0.0
 msgpack >= 0.6.0