From 03bd23a8202cabb17b82ca3771fa0dcd3b1a8b8f Mon Sep 17 00:00:00 2001
From: Ben Frederickson <ben@benfrederickson.com>
Date: Tue, 17 Dec 2024 11:41:25 -0800
Subject: [PATCH 1/3] Fix CI for python cuvs_bench

I'm seeing CI failures due to a missing 'setuptools' on
a recent PR https://github.com/rapidsai/cuvs/actions/runs/12363479650/job/34545223389?pr=536
in building the cuvs_bench code.

This seems to be because we were missing some requires in dependencies.yaml.
Fix
---
 dependencies.yaml                | 3 ++-
 python/cuvs_bench/pyproject.toml | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index eca97d2f5..50399c5a8 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -123,7 +123,8 @@ files:
     extras:
       table: tool.rapids-build-backend
       key: requires
-    includes: []
+    includes:
+      - rapids_build_setuptools
   py_run_cuvs_bench:
     output: pyproject
     pyproject_dir: python/cuvs_bench
diff --git a/python/cuvs_bench/pyproject.toml b/python/cuvs_bench/pyproject.toml
index 75e5406d4..69bae8792 100644
--- a/python/cuvs_bench/pyproject.toml
+++ b/python/cuvs_bench/pyproject.toml
@@ -68,6 +68,9 @@ version = { file = "cuvs_bench/VERSION" }
 [tool.rapids-build-backend]
 build-backend = "setuptools.build_meta"
 requires = [
+    "rapids-build-backend>=0.3.0,<0.4.0.dev0",
+    "setuptools",
+    "wheel",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 dependencies-file = "../../dependencies.yaml"
 matrix-entry = "cuda_suffixed=true"

From 6333d0673e3f5d4c9df8afffd85447f85d004d54 Mon Sep 17 00:00:00 2001
From: Ben Frederickson <ben@benfrederickson.com>
Date: Tue, 17 Dec 2024 12:39:56 -0800
Subject: [PATCH 2/3] Revert "Fix CI for python cuvs_bench"

This reverts commit 03bd23a8202cabb17b82ca3771fa0dcd3b1a8b8f.
---
 dependencies.yaml                | 3 +--
 python/cuvs_bench/pyproject.toml | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index 50399c5a8..eca97d2f5 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -123,8 +123,7 @@ files:
     extras:
       table: tool.rapids-build-backend
       key: requires
-    includes:
-      - rapids_build_setuptools
+    includes: []
   py_run_cuvs_bench:
     output: pyproject
     pyproject_dir: python/cuvs_bench
diff --git a/python/cuvs_bench/pyproject.toml b/python/cuvs_bench/pyproject.toml
index 69bae8792..75e5406d4 100644
--- a/python/cuvs_bench/pyproject.toml
+++ b/python/cuvs_bench/pyproject.toml
@@ -68,9 +68,6 @@ version = { file = "cuvs_bench/VERSION" }
 [tool.rapids-build-backend]
 build-backend = "setuptools.build_meta"
 requires = [
-    "rapids-build-backend>=0.3.0,<0.4.0.dev0",
-    "setuptools",
-    "wheel",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 dependencies-file = "../../dependencies.yaml"
 matrix-entry = "cuda_suffixed=true"

From faec0fdd02cc86582c25e782d3acf5be5ae60559 Mon Sep 17 00:00:00 2001
From: Ben Frederickson <ben@benfrederickson.com>
Date: Tue, 17 Dec 2024 12:40:38 -0800
Subject: [PATCH 3/3] Add missing setuptools to conda recipe

---
 conda/recipes/cuvs-bench/meta.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conda/recipes/cuvs-bench/meta.yaml b/conda/recipes/cuvs-bench/meta.yaml
index 0681a1038..d77aee8ce 100644
--- a/conda/recipes/cuvs-bench/meta.yaml
+++ b/conda/recipes/cuvs-bench/meta.yaml
@@ -79,6 +79,7 @@ requirements:
     - python
     - rapids-build-backend>=0.3.0,<0.4.0.dev0
     - rmm ={{ minor_version }}
+    - setuptools>=64.0.0
 
   run:
     - benchmark