From f22ed652c6d71e189ea26c444cb399886b035367 Mon Sep 17 00:00:00 2001
From: Jacob Tomlinson <jtomlinson@nvidia.com>
Date: Wed, 15 Oct 2025 08:18:24 +0100
Subject: [PATCH 1/5] Update to recent Python versions

---
 .github/workflows/release.yml | 6 +++---
 .github/workflows/tests.yml   | 2 +-
 setup.py                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c66a432..76682c6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,10 +10,10 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v2
 
-      - name: Set up Python 3.10
+      - name: Set up Python 3.13
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.13"
 
       - name: Install pypa/build
         run: python -m pip install build wheel pyyaml
@@ -24,7 +24,7 @@ jobs:
 
       - name: Publish package to PyPI
         if: github.repository == 'dask/dask-mpi' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 23ada72..c772384 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.7', '3.8']
+        python: ['3.10', '3.11', '3.12', '3.13']
         mpi: ['mpich', 'openmpi']
     env:
       PYTHON: ${{ matrix.python }}
diff --git a/setup.py b/setup.py
index d197b71..ab20d2e 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ def environment_dependencies(obj, dependencies=None):
     license="BSD 3-Clause",
     include_package_data=True,
     install_requires=install_requires,
-    python_requires=">=3.6,<3.12",
+    python_requires=">=3.10",
     packages=["dask_mpi"],
     long_description=long_description,
     entry_points="""

From 0fe49e9a9594c064f9041be0bf63f2744e4a74da Mon Sep 17 00:00:00 2001
From: Jacob Tomlinson <jtomlinson@nvidia.com>
Date: Wed, 15 Oct 2025 08:20:19 +0100
Subject: [PATCH 2/5] Bump docs Python version too

---
 docs/environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/environment.yml b/docs/environment.yml
index 39caad7..40c4233 100644
--- a/docs/environment.yml
+++ b/docs/environment.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - python<3.12
+  - python<3.14
   - dask>=2.19
   - distributed>=2.19
   - mpich

From cd1fc784894928d16bd79131a1c8d763046cad12 Mon Sep 17 00:00:00 2001
From: Jacob Tomlinson <jtomlinson@nvidia.com>
Date: Wed, 15 Oct 2025 08:21:48 +0100
Subject: [PATCH 3/5] Explicitly install setuptools

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 76682c6..f219a60 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
           python-version: "3.13"
 
       - name: Install pypa/build
-        run: python -m pip install build wheel pyyaml
+        run: python -m pip install setuptools build wheel pyyaml
 
       - name: Build distributions
         shell: bash -l {0}

From 838b7e74411da817bbd6526a89d9145d25a48b70 Mon Sep 17 00:00:00 2001
From: Jacob Tomlinson <jtomlinson@nvidia.com>
Date: Wed, 15 Oct 2025 08:22:57 +0100
Subject: [PATCH 4/5] Switch to open channels only

---
 ci/env-mpich.yml   | 2 +-
 ci/env-openmpi.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/env-mpich.yml b/ci/env-mpich.yml
index 4f2c2fb..0151dae 100644
--- a/ci/env-mpich.yml
+++ b/ci/env-mpich.yml
@@ -1,7 +1,7 @@
 name: dask-mpi-dev
 channels:
   - conda-forge
-  - defaults
+  - nodefaults
 dependencies:
   - dask>=2.19
   - distributed>=2.19
diff --git a/ci/env-openmpi.yml b/ci/env-openmpi.yml
index 8301973..8a6d331 100644
--- a/ci/env-openmpi.yml
+++ b/ci/env-openmpi.yml
@@ -1,7 +1,7 @@
 name: dask-mpi-dev
 channels:
   - conda-forge
-  - defaults
+  - nodefaults
 dependencies:
   - dask>=2.19
   - distributed>=2.19

From d25b142c002dba3373e66519d165c40ac8711743 Mon Sep 17 00:00:00 2001
From: Jacob Tomlinson <jtomlinson@nvidia.com>
Date: Wed, 15 Oct 2025 08:29:14 +0100
Subject: [PATCH 5/5] Remove pytest-icdiff plugin as it doesn't support recent
 Python versions

---
 ci/env-mpich.yml   | 1 -
 ci/env-openmpi.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/ci/env-mpich.yml b/ci/env-mpich.yml
index 0151dae..b828f03 100644
--- a/ci/env-mpich.yml
+++ b/ci/env-mpich.yml
@@ -8,7 +8,6 @@ dependencies:
   - mpich
   - mpi4py>=3.0.3
   - pytest
-  - pytest-icdiff
   - pytest-cov
   - coverage
   - requests
diff --git a/ci/env-openmpi.yml b/ci/env-openmpi.yml
index 8a6d331..e2cc32d 100644
--- a/ci/env-openmpi.yml
+++ b/ci/env-openmpi.yml
@@ -8,7 +8,6 @@ dependencies:
   - openmpi
   - mpi4py>=3.0.3
   - pytest
-  - pytest-icdiff
   - pytest-cov
   - coverage
   - requests