From 7ca20b8670034f584739811b8dfc67e9a5093363 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Tue, 24 Dec 2024 11:12:45 -0600
Subject: [PATCH] try excluding breathe from conda env

---
 .../src/rapids-build-utils/devcontainer-feature.json   |  2 +-
 .../rapids-build-utils/bin/make-conda-dependencies.sh  |  6 +++---
 .../opt/rapids-build-utils/bin/make-conda-env.sh       |  3 ++-
 .../rapids-build-utils/bin/make-pip-dependencies.sh    | 10 +++++-----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
index 3de0e265..ba55907f 100644
--- a/features/src/rapids-build-utils/devcontainer-feature.json
+++ b/features/src/rapids-build-utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "25.2.3",
+  "version": "25.2.4",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index 9087946b..1accb544 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -9,9 +9,9 @@
 #  -h,--help             Print this text.
 #
 # Options that require values:
-#  -e,--exclude <file>     Path(s) to requirement files of packages to exclude.
-#  -i,--include <file>     Path(s) to requirement files of packages to include.
-#  -k,--key <key>        Only include the key(s)
+#  -e,--exclude <package>  Packages to exclude from the final environment (can be provided multiple times).
+#  -i,--include <package>  Packages to include in the final environment (can be provided multiple times).
+#  -k,--key <key>          Only include the key(s)
 #  --matrix-entry <entry>  Matrix entries, in the form 'key=value' to be added to the '--matrix' arg
 #                          of rapids-dependency-file-generator.
 #                          (can be passed multiple times)
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index 0fcb8627..ff5b230b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -35,7 +35,8 @@ make_conda_env() {
     local -r new_env_path="$(realpath -m "/tmp/${env_file_name}")";
     local -r old_env_path="$(realpath -m "${HOME}/.conda/envs/${env_file_name}")";
 
-    rapids-make-conda-dependencies "${OPTS[@]}" > "${new_env_path}";
+    # the '--exclude <(echo breathe)' can be removed when https://github.com/conda-forge/breathe-feedstock/pull/64 is merged
+    rapids-make-conda-dependencies --exclude <(echo breathe) "${OPTS[@]}" > "${new_env_path}";
 
     if test -f "${new_env_path}" && test "$(wc -l "${new_env_path}" | cut -d' ' -f1)" -gt 0; then
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index 4a1ec400..c5df0de9 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Usage:
-#  rapids-make-conda-dependencies [OPTION]...
+#  rapids-make-pip-dependencies [OPTION]...
 #
 # Generate a combined pip requirements file for all repos.
 #
@@ -10,8 +10,8 @@
 #  --no-dedupe             Don't sort and dedupe the combined requirements.txt.
 #
 # Options that require values:
-#  -e,--exclude <file>     Path(s) to requirement files of packages to exclude.
-#  -i,--include <file>     Path(s) to requirement files of packages to include.
+#  -e,--exclude <package>  Packages to exclude from the final environment (can be provided multiple times).
+#  -i,--include <package>  Packages to include in the final environment (can be provided multiple times).
 #  -k,--key <key>          Only include the key(s)
 #  --matrix-entry <entry>  Matrix entries, in the form 'key=value' to be added to the '--matrix' arg
 #                          of rapids-dependency-file-generator.
@@ -49,12 +49,12 @@ make_pip_dependencies() {
 
     local -a _exclude=();
     local exc; for exc in "${exclude[@]}"; do
-        _exclude+=(-f "${exc}");
+        _exclude+=("${exc}");
     done
 
     local -a _include=();
     local inc; for inc in "${include[@]}"; do
-        _include+=(-f "${inc}");
+        _include+=("${inc}");
     done
 
     local cuda_version="${CUDA_VERSION_MAJOR_MINOR:-}";