Merge branch 'main' into prometheus_paused_workers

dask · Apr 11, 2024 · 97675e9 · 97675e9
2 parents bcc262c + 66ced13
commit 97675e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/continuous_integration/environment-3.10.yaml b/continuous_integration/environment-3.10.yaml
@@ -47,7 +47,8 @@ dependencies:
   - pip:
       - git+https://github.com/dask/dask
       - git+https://github.com/dask-contrib/dask-expr
-      - git+https://github.com/dask/s3fs
       - git+https://github.com/dask/zict
-      - git+https://github.com/fsspec/filesystem_spec
+      # Revert after https://github.com/dask/distributed/issues/8614 is fixed
+      # - git+https://github.com/dask/s3fs
+      # - git+https://github.com/fsspec/filesystem_spec
       - keras
diff --git a/continuous_integration/environment-3.11.yaml b/continuous_integration/environment-3.11.yaml
@@ -47,7 +47,8 @@ dependencies:
   - pip:
       - git+https://github.com/dask/dask
       - git+https://github.com/dask-contrib/dask-expr
-      - git+https://github.com/dask/s3fs
       - git+https://github.com/dask/zict
-      - git+https://github.com/fsspec/filesystem_spec
+      # Revert after https://github.com/dask/distributed/issues/8614 is fixed
+      # - git+https://github.com/dask/s3fs
+      # - git+https://github.com/fsspec/filesystem_spec
       - keras
diff --git a/continuous_integration/environment-3.12.yaml b/continuous_integration/environment-3.12.yaml
@@ -47,7 +47,8 @@ dependencies:
   - pip:
       - git+https://github.com/dask/dask
       - git+https://github.com/dask-contrib/dask-expr
-      - git+https://github.com/dask/s3fs
       - git+https://github.com/dask/zict
-      - git+https://github.com/fsspec/filesystem_spec
+      # Revert after https://github.com/dask/distributed/issues/8614 is fixed
+      # - git+https://github.com/dask/s3fs
+      # - git+https://github.com/fsspec/filesystem_spec
       - keras