Skip to content

Commit 12e8925

Browse files
authored
fix rapids-python-conda-pkg-names script for rattler recipes (#496)
1 parent 67601cf commit 12e8925

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

features/src/rapids-build-utils/devcontainer-feature.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "NVIDIA RAPIDS devcontainer build utilities",
33
"id": "rapids-build-utils",
4-
"version": "25.6.3",
4+
"version": "25.6.4",
55
"description": "A feature to install the RAPIDS devcontainer build utilities",
66
"containerEnv": {
77
"BASH_ENV": "/etc/bash.bash_env"

features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh

+12-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# shellcheck disable=SC1091
1818
. rapids-generate-docstring;
1919

20-
python_conda_pkg_names() {
20+
_python_conda_pkg_names() {
2121
local -;
2222
set -euo pipefail;
2323

@@ -38,7 +38,12 @@ python_conda_pkg_names() {
3838
if test -d ~/"${!repo_path:-}/.git"; then
3939
# the regex will continue until morale improves
4040
find ~/"${!repo_path}/" \
41-
-type f -name 'meta.yaml' \
41+
-type f \
42+
\( \
43+
-name 'meta.yaml' \
44+
-or \
45+
-name 'recipe.yaml' \
46+
\) \
4247
! -path '*/.conda/*' \
4348
! -path '*/build/*' \
4449
! -path '*/_skbuild/*' \
@@ -47,9 +52,12 @@ python_conda_pkg_names() {
4752
2>/dev/null \
4853
| tr -d '[:blank:]' \
4954
| cut -d':' -f2 \
55+
| tr '[:space:]' '\0' \
56+
| tr -s '\0' \
57+
| tr '\0' '\n' \
5058
;
5159
fi
52-
done
60+
done | sort -u;
5361
}
5462

55-
python_conda_pkg_names "$@" <&0;
63+
_python_conda_pkg_names "$@" <&0;

0 commit comments

Comments
 (0)