From c12086a8bceeecfe1d896777be853575e766fee3 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Mon, 29 Jul 2024 15:47:03 -0700
Subject: [PATCH 1/3] Fix ucx-py dependency in update-version.sh

---
 ci/release/update-version.sh | 12 +++++++-----
 dependencies.yaml            |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
index ce2488ad0bf..37cf40fb8cf 100755
--- a/ci/release/update-version.sh
+++ b/ci/release/update-version.sh
@@ -72,15 +72,17 @@ DEPENDENCIES=(
   ucx-py
   rapids-dask-dependency
 )
-for DEP in "${DEPENDENCIES[@]}"; do
-  for FILE in dependencies.yaml conda/environments/*.yaml python/cugraph-{pyg,dgl}/conda/*.yaml; do
+for FILE in dependencies.yaml conda/environments/*.yaml python/cugraph-{pyg,dgl}/conda/*.yaml; do
+  for DEP in "${DEPENDENCIES[@]}"; do
     sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}"
-    sed_runner "/-.* ucx-py==/ s/==.*/==${NEXT_UCX_PY_VERSION}.*,>=0.0.0a0/g" "${FILE}"
   done
-  for FILE in python/**/pyproject.toml python/**/**/pyproject.toml; do
+  sed_runner "/-.* ucx-py\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_UCX_PY_VERSION}.*,>=0.0.0a0/g" "${FILE}"
+done
+for FILE in python/**/pyproject.toml python/**/**/pyproject.toml; do
+  for DEP in "${DEPENDENCIES[@]}"; do
     sed_runner "/\"${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0\"/g" "${FILE}"
-    sed_runner "/\"ucx-py==/ s/==.*\"/==${NEXT_UCX_PY_VERSION}.*,>=0.0.0a0\"/g" "${FILE}"
   done
+  sed_runner "/\"ucx-py\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*\"/==${NEXT_UCX_PY_VERSION}.*,>=0.0.0a0\"/g" "${FILE}"
 done
 
 # ucx-py version
diff --git a/dependencies.yaml b/dependencies.yaml
index a02b4e156fd..e5edb9f918d 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -505,11 +505,11 @@ dependencies:
           - matrix:
               cuda: "11.*"
             packages:
-              - &ucx_py_cu11 ucx-py-cu11==24.10.*,>=0.0.0a0
+              - &ucx_py_cu11 ucx-py-cu11==0.40.*,>=0.0.0a0
           - matrix:
               cuda: "12.*"
             packages:
-              - &ucx_py_cu12 ucx-py-cu12==24.10.*,>=0.0.0a0
+              - &ucx_py_cu12 ucx-py-cu12==0.40.*,>=0.0.0a0
           - matrix:
             packages:
               - *ucx_py

From 7954eec8f8271065251fd51312d94ec3b65c6071 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Mon, 29 Jul 2024 17:56:52 -0500
Subject: [PATCH 2/3] Don't double-replace ucx-py.

---
 ci/release/update-version.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
index 37cf40fb8cf..08c22fca02e 100755
--- a/ci/release/update-version.sh
+++ b/ci/release/update-version.sh
@@ -69,7 +69,6 @@ DEPENDENCIES=(
   pyraft
   raft-dask
   rmm
-  ucx-py
   rapids-dask-dependency
 )
 for FILE in dependencies.yaml conda/environments/*.yaml python/cugraph-{pyg,dgl}/conda/*.yaml; do

From 6e61cd6d16b6f3a1828063d0d9d95a2a91eb65e0 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Tue, 30 Jul 2024 08:12:33 -0700
Subject: [PATCH 3/3] Update pip devcontainers to UCX v1.17.0

---
 .devcontainer/cuda12.5-pip/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/cuda12.5-pip/devcontainer.json b/.devcontainer/cuda12.5-pip/devcontainer.json
index 1c53bd9925d..6e2bf45700a 100644
--- a/.devcontainer/cuda12.5-pip/devcontainer.json
+++ b/.devcontainer/cuda12.5-pip/devcontainer.json
@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "12.5",
       "PYTHON_PACKAGE_MANAGER": "pip",
-      "BASE": "rapidsai/devcontainers:24.10-cpp-cuda12.5-ucx1.15.0-openmpi-ubuntu22.04"
+      "BASE": "rapidsai/devcontainers:24.10-cpp-cuda12.5-ucx1.17.0-openmpi-ubuntu22.04"
     }
   },
   "runArgs": [