From 2b516959f409bc410e175b3d6a3bac10e7368520 Mon Sep 17 00:00:00 2001
From: Patrick Hoefler <61934744+phofl@users.noreply.github.com>
Date: Thu, 24 Oct 2024 10:48:31 +0100
Subject: [PATCH 1/3] Add ci job for python 3.13

---
 .github/workflows/tests.yaml                 | 10 +++-
 continuous_integration/environment-3.13.yaml | 55 ++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 continuous_integration/environment-3.13.yaml

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 2deffff9d6..b4d924e41c 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        environment: [mindeps, "3.10", "3.11", "3.12"]
+        environment: [mindeps, "3.10", "3.11", "3.12", "3.13"]
         label: [default]
         extra_packages: [null]
         # Cherry-pick test modules to split the overall runtime roughly in half
@@ -40,6 +40,8 @@ jobs:
             environment: "3.10"
           - os: macos-latest
             environment: "3.11"
+          - os: macos-latest
+            environment: "3.13"
 
           - os: windows-latest
             environment: mindeps
@@ -174,6 +176,12 @@ jobs:
             || steps.cache.outputs.cache-hit != 'true'
           )
 
+      - name: Install PyArrow nightlies for Python 3.13
+        if: ${{ matrix.environment == '3.13' }}
+        run: | 
+          pip install --extra-index-url https://pypi.fury.io/arrow-nightlies/ --prefer-binary --pre pyarrow
+          pip install git+https://github.com/dask/dask-expr          
+
       - name: Install
         shell: bash -l {0}
         run: |
diff --git a/continuous_integration/environment-3.13.yaml b/continuous_integration/environment-3.13.yaml
new file mode 100644
index 0000000000..c26c4d2942
--- /dev/null
+++ b/continuous_integration/environment-3.13.yaml
@@ -0,0 +1,55 @@
+name: dask-distributed-313
+channels:
+  - conda-forge
+dependencies:
+  - python=3.13
+  - packaging
+  - pip
+  - asyncssh
+  - bokeh
+  - click
+  - cloudpickle
+  - coverage
+  - dask  # overridden by git tip below
+  - filesystem-spec  # overridden by git tip below
+  - gilknocker
+  - h5py
+  - ipykernel
+  - ipywidgets
+  - jinja2
+  - jupyter-server-proxy
+  - jupyterlab
+  - locket
+  - msgpack-python
+  - netcdf4
+  - paramiko
+  - pre-commit
+  - prometheus_client
+  - psutil
+  #- pyarrow
+  - pytest
+  - pytest-cov
+  - pytest-faulthandler
+  - pytest-repeat
+  - pytest-rerunfailures
+  - pytest-timeout
+  - requests
+  - s3fs  # overridden by git tip below
+  - scikit-learn
+  - scipy
+  - sortedcollections
+  - tblib
+  - toolz
+  - tornado
+  - zict  # overridden by git tip below
+  - zstandard
+  # Temporary fix for https://github.com/pypa/setuptools/issues/4496
+  - setuptools < 71
+  - pip:
+      - git+https://github.com/dask/dask
+      # - git+https://github.com/dask-contrib/dask-expr
+      - git+https://github.com/dask/zict
+      # 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

From 7c5d73f9b56867c9f87d9a538c79eef8f8c00b73 Mon Sep 17 00:00:00 2001
From: Patrick Hoefler <61934744+phofl@users.noreply.github.com>
Date: Thu, 24 Oct 2024 11:22:04 +0100
Subject: [PATCH 2/3] Add ci job for python 3.13

---
 continuous_integration/environment-3.13.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/continuous_integration/environment-3.13.yaml b/continuous_integration/environment-3.13.yaml
index c26c4d2942..c7b76894fd 100644
--- a/continuous_integration/environment-3.13.yaml
+++ b/continuous_integration/environment-3.13.yaml
@@ -6,7 +6,7 @@ dependencies:
   - packaging
   - pip
   - asyncssh
-  - bokeh
+  - bokeh>3
   - click
   - cloudpickle
   - coverage

From 460407d11b948ca7555eb4dfab3ebe04f77f914d Mon Sep 17 00:00:00 2001
From: Patrick Hoefler <61934744+phofl@users.noreply.github.com>
Date: Thu, 24 Oct 2024 11:54:42 +0100
Subject: [PATCH 3/3] Update

---
 .github/workflows/tests.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index b4d924e41c..0c37d2f6e5 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -178,6 +178,7 @@ jobs:
 
       - name: Install PyArrow nightlies for Python 3.13
         if: ${{ matrix.environment == '3.13' }}
+        shell: bash -l {0}
         run: | 
           pip install --extra-index-url https://pypi.fury.io/arrow-nightlies/ --prefer-binary --pre pyarrow
           pip install git+https://github.com/dask/dask-expr