From 34697a69b91ff5b65b1556a3b8a557dba58674f9 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Fri, 20 Dec 2024 13:50:24 -0500
Subject: [PATCH] align thriftpy2 floors, remove libraft-headers

---
 ci/release/update-version.sh                     | 1 -
 conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +-
 conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +-
 conda/recipes/libcugraph/meta.yaml               | 2 --
 dependencies.yaml                                | 2 +-
 python/cugraph-service/client/pyproject.toml     | 2 +-
 python/cugraph-service/server/pyproject.toml     | 2 +-
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
index a73745f2c0e..2890011bc7f 100755
--- a/ci/release/update-version.sh
+++ b/ci/release/update-version.sh
@@ -58,7 +58,6 @@ DEPENDENCIES=(
   dask-cudf
   libcudf
   libraft
-  libraft-headers
   librmm
   pylibcugraph
   pylibwholegraph
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index 5d0dc9569a4..7b2fddb7422 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -67,7 +67,7 @@ dependencies:
 - sphinx-markdown-tables
 - sphinx<6
 - sphinxcontrib-websupport
-- thriftpy2!=0.5.0,!=0.5.1
+- thriftpy2>=0.4.15,!=0.5.0,!=0.5.1
 - torchdata
 - torchmetrics
 - ucx-proc=*=gpu
diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
index 78a7df40d2c..87a2417bbc4 100644
--- a/conda/environments/all_cuda-125_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -72,7 +72,7 @@ dependencies:
 - sphinx-markdown-tables
 - sphinx<6
 - sphinxcontrib-websupport
-- thriftpy2!=0.5.0,!=0.5.1
+- thriftpy2>=0.4.15,!=0.5.0,!=0.5.1
 - torchdata
 - torchmetrics
 - ucx-proc=*=gpu
diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml
index 922d5e577b2..eb948e08d14 100644
--- a/conda/recipes/libcugraph/meta.yaml
+++ b/conda/recipes/libcugraph/meta.yaml
@@ -70,7 +70,6 @@ requirements:
     - doxygen {{ doxygen_version }}
     - libcudf ={{ minor_version }}
     - libraft ={{ minor_version }}
-    - libraft-headers ={{ minor_version }}
     - librmm ={{ minor_version }}
     - nccl {{ nccl_version }}
     - ucx-proc=*=gpu
@@ -114,7 +113,6 @@ outputs:
         - libcusparse
        {% endif %}
         - libraft ={{ minor_version }}
-        - libraft-headers ={{ minor_version }}
         - librmm ={{ minor_version }}
         - nccl {{ nccl_version }}
         - ucx-proc=*=gpu
diff --git a/dependencies.yaml b/dependencies.yaml
index e0c1b2f93bf..eb4bb68dc9d 100755
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -420,7 +420,7 @@ dependencies:
     common:
       - output_types: [conda, pyproject]
         packages:
-          - &thrift thriftpy2!=0.5.0,!=0.5.1
+          - &thrift thriftpy2>=0.4.15,!=0.5.0,!=0.5.1
   python_run_cugraph_service_server:
     common:
       - output_types: [conda, pyproject]
diff --git a/python/cugraph-service/client/pyproject.toml b/python/cugraph-service/client/pyproject.toml
index ac5e6bad0d5..093a578db2b 100644
--- a/python/cugraph-service/client/pyproject.toml
+++ b/python/cugraph-service/client/pyproject.toml
@@ -20,7 +20,7 @@ authors = [
 license = { text = "Apache 2.0" }
 requires-python = ">=3.10"
 dependencies = [
-    "thriftpy2!=0.5.0,!=0.5.1",
+    "thriftpy2>=0.4.15,!=0.5.0,!=0.5.1",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [
     "Intended Audience :: Developers",
diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml
index adb18f57216..29ee41854f8 100644
--- a/python/cugraph-service/server/pyproject.toml
+++ b/python/cugraph-service/server/pyproject.toml
@@ -30,7 +30,7 @@ dependencies = [
     "numpy>=1.23,<3.0a0",
     "rapids-dask-dependency==25.2.*,>=0.0.0a0",
     "rmm==25.2.*,>=0.0.0a0",
-    "thriftpy2!=0.5.0,!=0.5.1",
+    "thriftpy2>=0.4.15,!=0.5.0,!=0.5.1",
     "ucx-py==0.42.*,>=0.0.0a0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [