From 7540f2834bfa9c641bb45426b19db0ab5caddfe7 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Tue, 11 Nov 2025 15:07:31 +0000 Subject: [PATCH 1/8] Run CI to investigate #9140 From 6fdd6698c832f032acc02f55ae26fcccbe57eeb4 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Tue, 11 Nov 2025 17:44:43 +0000 Subject: [PATCH 2/8] Exclude broken tblib 3.2.1 --- pyproject.toml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d567535bc0..7a951a00c6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,8 +5,8 @@ build-backend = "setuptools.build_meta" [project] name = "distributed" description = "Distributed scheduler for Dask" -maintainers = [{name = "Matthew Rocklin", email = "mrocklin@gmail.com"}] -license = {text = "BSD-3-Clause"} +maintainers = [{ name = "Matthew Rocklin", email = "mrocklin@gmail.com" }] +license = { text = "BSD-3-Clause" } classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", @@ -36,7 +36,7 @@ dependencies = [ "psutil >= 5.8.0", "pyyaml >= 5.4.1", "sortedcontainers >= 2.0.5", - "tblib >= 1.6.0", + "tblib >= 1.6.0,!=3.2.1", "toolz >= 0.11.2", "tornado >= 6.2.0", "urllib3 >= 1.26.5", @@ -68,17 +68,18 @@ exclude = ["*tests*"] namespaces = false [tool.setuptools.package-data] -"*" = [ - "templates/index.html", - "template.html", -] -distributed = [ - "http/templates/*.html", - "py.typed", -] +"*" = ["templates/index.html", "template.html"] +distributed = ["http/templates/*.html", "py.typed"] [tool.isort] -sections = ["FUTURE", "STDLIB", "THIRDPARTY", "DISTRIBUTED", "FIRSTPARTY", "LOCALFOLDER"] +sections = [ + "FUTURE", + "STDLIB", + "THIRDPARTY", + "DISTRIBUTED", + "FIRSTPARTY", + "LOCALFOLDER", +] profile = "black" skip_gitignore = true force_to_top = ["true"] @@ -156,11 +157,11 @@ minversion = "6" markers = [ "ci1: marks tests as belonging to 1 out of 2 partitions to run on CI ('-m \"not ci1\"' for second partition)", "extra_packages: marks tests that require a special dependency to run.", - "slow: marks tests as slow (deselected by default", # select with '--runslow') + "slow: marks tests as slow (deselected by default", # select with '--runslow') "avoid_ci: marks tests as flaky or broken on CI on all OSs", "ipython: marks tests as exercising IPython", "gpu: marks tests we want to run on GPUs", - "leaking: ignore leaked resources", # see pytest_resourceleaks.py for usage + "leaking: ignore leaked resources", # see pytest_resourceleaks.py for usage "workerstate: deterministic test for the worker state machine. Automatically applied to all tests that use the 'ws' fixture.", ] # pytest-timeout settings @@ -243,7 +244,7 @@ exclude_lines = [ "except ImportError", "@overload", "@abstractmethod", - "@abc.abstractmethod" + "@abc.abstractmethod", ] [tool.coverage.html] From d1e911216b369edec1d4f1f737e7a045d0607cf9 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Tue, 11 Nov 2025 19:21:36 +0000 Subject: [PATCH 3/8] Exclude broken tblib >3.2 --- continuous_integration/environment-3.10.yaml | 2 +- continuous_integration/environment-3.11.yaml | 2 +- continuous_integration/environment-3.12.yaml | 2 +- continuous_integration/environment-3.13.yaml | 2 +- pyproject.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/continuous_integration/environment-3.10.yaml b/continuous_integration/environment-3.10.yaml index c1f45fc7f2..9a1554b7eb 100644 --- a/continuous_integration/environment-3.10.yaml +++ b/continuous_integration/environment-3.10.yaml @@ -45,7 +45,7 @@ dependencies: - scikit-learn - scipy - sortedcollections - - tblib + - tblib <3.2 - toolz - torchvision # Only tested here - tornado diff --git a/continuous_integration/environment-3.11.yaml b/continuous_integration/environment-3.11.yaml index 82bf620a24..07d41b48f3 100644 --- a/continuous_integration/environment-3.11.yaml +++ b/continuous_integration/environment-3.11.yaml @@ -39,7 +39,7 @@ dependencies: - scikit-learn - scipy - sortedcollections - - tblib + - tblib <3.2 - toolz - tornado - zict # overridden by git tip below diff --git a/continuous_integration/environment-3.12.yaml b/continuous_integration/environment-3.12.yaml index db95ec1c49..867d0bcbf7 100644 --- a/continuous_integration/environment-3.12.yaml +++ b/continuous_integration/environment-3.12.yaml @@ -39,7 +39,7 @@ dependencies: - scikit-learn - scipy - sortedcollections - - tblib + - tblib <3.2 - toolz - tornado - zict # overridden by git tip below diff --git a/continuous_integration/environment-3.13.yaml b/continuous_integration/environment-3.13.yaml index 4180028926..59bf4b9cbe 100644 --- a/continuous_integration/environment-3.13.yaml +++ b/continuous_integration/environment-3.13.yaml @@ -38,7 +38,7 @@ dependencies: - scikit-learn - scipy - sortedcollections - - tblib + - tblib <3.2 - toolz - tornado - zict # overridden by git tip below diff --git a/pyproject.toml b/pyproject.toml index 7a951a00c6..069749159c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,7 @@ dependencies = [ "psutil >= 5.8.0", "pyyaml >= 5.4.1", "sortedcontainers >= 2.0.5", - "tblib >= 1.6.0,!=3.2.1", + "tblib >= 1.6.0,<3.2", "toolz >= 0.11.2", "tornado >= 6.2.0", "urllib3 >= 1.26.5", From f188f7a74578dc148169f79257e91f1952d01559 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Tue, 11 Nov 2025 19:27:38 +0000 Subject: [PATCH 4/8] Exclude broken tblib >3.2 in conda recipe too --- continuous_integration/recipes/distributed/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continuous_integration/recipes/distributed/meta.yaml b/continuous_integration/recipes/distributed/meta.yaml index b328d8f22a..da2a54ea85 100644 --- a/continuous_integration/recipes/distributed/meta.yaml +++ b/continuous_integration/recipes/distributed/meta.yaml @@ -43,7 +43,7 @@ requirements: - psutil >=5.8.0 - pyyaml >=5.4.1 - sortedcontainers >=2.0.5 - - tblib >=1.6.0 + - tblib >=1.6.0,<3.2 - toolz >=0.10.0 - tornado >=6.2.0 - urllib3 >=1.26.5 From b56d89c1614fd829f21ec4a5903ad700cb50b082 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Wed, 12 Nov 2025 10:33:47 +0000 Subject: [PATCH 5/8] Specifically exclude !=3.2.0,!=3.2.1 --- continuous_integration/environment-3.10.yaml | 2 +- continuous_integration/environment-3.11.yaml | 2 +- continuous_integration/environment-3.12.yaml | 2 +- continuous_integration/environment-3.13.yaml | 2 +- .../recipes/distributed/meta.yaml | 2 +- pyproject.toml | 31 +++++++++---------- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/continuous_integration/environment-3.10.yaml b/continuous_integration/environment-3.10.yaml index 9a1554b7eb..6098096e86 100644 --- a/continuous_integration/environment-3.10.yaml +++ b/continuous_integration/environment-3.10.yaml @@ -45,7 +45,7 @@ dependencies: - scikit-learn - scipy - sortedcollections - - tblib <3.2 + - tblib !=3.2.0,!=3.2.1 - toolz - torchvision # Only tested here - tornado diff --git a/continuous_integration/environment-3.11.yaml b/continuous_integration/environment-3.11.yaml index 07d41b48f3..c2376a036c 100644 --- a/continuous_integration/environment-3.11.yaml +++ b/continuous_integration/environment-3.11.yaml @@ -39,7 +39,7 @@ dependencies: - scikit-learn - scipy - sortedcollections - - tblib <3.2 + - tblib !=3.2.0,!=3.2.1 - toolz - tornado - zict # overridden by git tip below diff --git a/continuous_integration/environment-3.12.yaml b/continuous_integration/environment-3.12.yaml index 867d0bcbf7..efbb1c4397 100644 --- a/continuous_integration/environment-3.12.yaml +++ b/continuous_integration/environment-3.12.yaml @@ -39,7 +39,7 @@ dependencies: - scikit-learn - scipy - sortedcollections - - tblib <3.2 + - tblib !=3.2.0,!=3.2.1 - toolz - tornado - zict # overridden by git tip below diff --git a/continuous_integration/environment-3.13.yaml b/continuous_integration/environment-3.13.yaml index 59bf4b9cbe..a3ef5d7451 100644 --- a/continuous_integration/environment-3.13.yaml +++ b/continuous_integration/environment-3.13.yaml @@ -38,7 +38,7 @@ dependencies: - scikit-learn - scipy - sortedcollections - - tblib <3.2 + - tblib !=3.2.0,!=3.2.1 - toolz - tornado - zict # overridden by git tip below diff --git a/continuous_integration/recipes/distributed/meta.yaml b/continuous_integration/recipes/distributed/meta.yaml index da2a54ea85..7fa5a531ca 100644 --- a/continuous_integration/recipes/distributed/meta.yaml +++ b/continuous_integration/recipes/distributed/meta.yaml @@ -43,7 +43,7 @@ requirements: - psutil >=5.8.0 - pyyaml >=5.4.1 - sortedcontainers >=2.0.5 - - tblib >=1.6.0,<3.2 + - tblib >=1.6.0,!=3.2.0,!=3.2.1 - toolz >=0.10.0 - tornado >=6.2.0 - urllib3 >=1.26.5 diff --git a/pyproject.toml b/pyproject.toml index 069749159c..ade5d6e9b7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,8 +5,8 @@ build-backend = "setuptools.build_meta" [project] name = "distributed" description = "Distributed scheduler for Dask" -maintainers = [{ name = "Matthew Rocklin", email = "mrocklin@gmail.com" }] -license = { text = "BSD-3-Clause" } +maintainers = [{name = "Matthew Rocklin", email = "mrocklin@gmail.com"}] +license = {text = "BSD-3-Clause"} classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", @@ -36,7 +36,7 @@ dependencies = [ "psutil >= 5.8.0", "pyyaml >= 5.4.1", "sortedcontainers >= 2.0.5", - "tblib >= 1.6.0,<3.2", + "tblib >= 1.6.0,!=3.2.0,!=3.2.1", "toolz >= 0.11.2", "tornado >= 6.2.0", "urllib3 >= 1.26.5", @@ -68,18 +68,17 @@ exclude = ["*tests*"] namespaces = false [tool.setuptools.package-data] -"*" = ["templates/index.html", "template.html"] -distributed = ["http/templates/*.html", "py.typed"] +"*" = [ + "templates/index.html", + "template.html", +] +distributed = [ + "http/templates/*.html", + "py.typed", +] [tool.isort] -sections = [ - "FUTURE", - "STDLIB", - "THIRDPARTY", - "DISTRIBUTED", - "FIRSTPARTY", - "LOCALFOLDER", -] +sections = ["FUTURE", "STDLIB", "THIRDPARTY", "DISTRIBUTED", "FIRSTPARTY", "LOCALFOLDER"] profile = "black" skip_gitignore = true force_to_top = ["true"] @@ -157,11 +156,11 @@ minversion = "6" markers = [ "ci1: marks tests as belonging to 1 out of 2 partitions to run on CI ('-m \"not ci1\"' for second partition)", "extra_packages: marks tests that require a special dependency to run.", - "slow: marks tests as slow (deselected by default", # select with '--runslow') + "slow: marks tests as slow (deselected by default", # select with '--runslow') "avoid_ci: marks tests as flaky or broken on CI on all OSs", "ipython: marks tests as exercising IPython", "gpu: marks tests we want to run on GPUs", - "leaking: ignore leaked resources", # see pytest_resourceleaks.py for usage + "leaking: ignore leaked resources", # see pytest_resourceleaks.py for usage "workerstate: deterministic test for the worker state machine. Automatically applied to all tests that use the 'ws' fixture.", ] # pytest-timeout settings @@ -244,7 +243,7 @@ exclude_lines = [ "except ImportError", "@overload", "@abstractmethod", - "@abc.abstractmethod", + "@abc.abstractmethod" ] [tool.coverage.html] From b82b475b17bc08d0992a2b5c49a4697a5be0908e Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Wed, 12 Nov 2025 10:39:45 +0000 Subject: [PATCH 6/8] Nudge CI From 077bbcb0bef283c806683bdedcb7b1616178e5a4 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Wed, 12 Nov 2025 10:46:39 +0000 Subject: [PATCH 7/8] Small string modification to nudge CI --- distributed/scheduler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributed/scheduler.py b/distributed/scheduler.py index 2d5ee2c8cf..178c607553 100644 --- a/distributed/scheduler.py +++ b/distributed/scheduler.py @@ -6566,7 +6566,7 @@ async def restart_workers( :meth:`Client.wait_for_workers` for granular control over how many workers to wait for. on_error: - If 'raise' (the default), raise if any nanny times out while restarting the + If "raise" (the default), raise if any nanny times out while restarting the worker. If 'return', return error messages. Returns From b8682c33482c92f51d987a2c248feaf0369ffa51 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Wed, 12 Nov 2025 10:47:10 +0000 Subject: [PATCH 8/8] Revert nudge --- distributed/scheduler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributed/scheduler.py b/distributed/scheduler.py index 178c607553..2d5ee2c8cf 100644 --- a/distributed/scheduler.py +++ b/distributed/scheduler.py @@ -6566,7 +6566,7 @@ async def restart_workers( :meth:`Client.wait_for_workers` for granular control over how many workers to wait for. on_error: - If "raise" (the default), raise if any nanny times out while restarting the + If 'raise' (the default), raise if any nanny times out while restarting the worker. If 'return', return error messages. Returns