From e17744f7aa5fa3c864ea006c1cd337c8a7663bbd Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Tue, 30 Apr 2024 17:50:24 -0500
Subject: [PATCH 1/4] support cpp wheels in 'rapids-wheels-anaconda'

---
 tools/rapids-wheels-anaconda | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/rapids-wheels-anaconda b/tools/rapids-wheels-anaconda
index 386ff2a..a94edf4 100755
--- a/tools/rapids-wheels-anaconda
+++ b/tools/rapids-wheels-anaconda
@@ -3,6 +3,13 @@
 
 # Positional Arguments:
 #   1) wheel name
+#   2) package type (one of: 'cpp', 'python')
+#
+# [usage]
+#
+#   # upload any wheels found in CI artifacts with names like '*wheel_python_sparkly-unicorn*.tar.gz'
+#   rapids-wheels-anaconda 'sparkly-unicorn' 'python'
+#
 
 set -exou pipefail
 source rapids-constants
@@ -13,8 +20,9 @@ if [ -z "$1" ]; then
   exit 1
 fi
 WHEEL_NAME="$1"
+PKG_TYPE="${2:-python}"
 
-WHEEL_SEARCH_KEY="wheel_python_${WHEEL_NAME}"
+WHEEL_SEARCH_KEY="wheel_${PKG_TYPE}_${WHEEL_NAME}"
 
 WHEEL_DIR="./dist"
 mkdir -p "${WHEEL_DIR}"

From 44a989e7526ff9aec2603a603fbdf3b3e035ffb0 Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Wed, 1 May 2024 08:02:20 -0500
Subject: [PATCH 2/4] Update tools/rapids-wheels-anaconda

Co-authored-by: Mike Sarahan <msarahan@gmail.com>
---
 tools/rapids-wheels-anaconda | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/rapids-wheels-anaconda b/tools/rapids-wheels-anaconda
index a94edf4..cbf3003 100755
--- a/tools/rapids-wheels-anaconda
+++ b/tools/rapids-wheels-anaconda
@@ -3,7 +3,7 @@
 
 # Positional Arguments:
 #   1) wheel name
-#   2) package type (one of: 'cpp', 'python')
+#   2) package type (one of: 'cpp', 'python'). If not provided, defaults to 'python' for compatibility with older code where python was the only behavior.
 #
 # [usage]
 #

From ad0e188510bc0b9be9bea5b3b9b0e67da85a60ac Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Wed, 1 May 2024 14:41:27 -0500
Subject: [PATCH 3/4] ensure unsupported values result in an informative error

---
 tools/rapids-wheels-anaconda | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools/rapids-wheels-anaconda b/tools/rapids-wheels-anaconda
index a94edf4..c484487 100755
--- a/tools/rapids-wheels-anaconda
+++ b/tools/rapids-wheels-anaconda
@@ -22,6 +22,17 @@ fi
 WHEEL_NAME="$1"
 PKG_TYPE="${2:-python}"
 
+case "${PKG_TYPE}" in
+  cpp)
+    ;;
+  python)
+    ;;
+  *)
+    rapids-echo-stderr 'Pass one of the following package types: "cpp", "python"'
+    exit 1
+    ;;
+esac
+
 WHEEL_SEARCH_KEY="wheel_${PKG_TYPE}_${WHEEL_NAME}"
 
 WHEEL_DIR="./dist"

From 73822517aca306c5929a1da46d7ced792094ee75 Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Wed, 1 May 2024 14:55:27 -0500
Subject: [PATCH 4/4] Update tools/rapids-wheels-anaconda

Co-authored-by: AJ Schmidt <ajschmidt8@users.noreply.github.com>
---
 tools/rapids-wheels-anaconda | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/rapids-wheels-anaconda b/tools/rapids-wheels-anaconda
index 39545e1..1d26c9a 100755
--- a/tools/rapids-wheels-anaconda
+++ b/tools/rapids-wheels-anaconda
@@ -11,7 +11,7 @@
 #   rapids-wheels-anaconda 'sparkly-unicorn' 'python'
 #
 
-set -exou pipefail
+set -eou pipefail
 source rapids-constants
 export RAPIDS_SCRIPT_NAME="rapids-wheels-anaconda"