Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Forward-merge branch-24.04 into branch-24.06 #259

Closed
wants to merge 1 commit into from
Closed

Forward-merge branch-24.04 into branch-24.06 #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion features/src/rapids-build-utils/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "NVIDIA RAPIDS devcontainer build utilities",
"id": "rapids-build-utils",
"version": "24.4.7",
"version": "24.4.8",
"description": "A feature to install the RAPIDS devcontainer build utilities",
"containerEnv": {
"BASH_ENV": "/etc/bash.bash_env"
Expand Down
8 changes: 3 additions & 5 deletions features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# --pre Include pre-release and development versions. By default, pip only finds
# stable versions.
# --no-pre Don't install pre-release and development versions.
# --system-site-packages Give the virtual environment access to the system site-packages dir.
# @_include_bool_options rapids-make-pip-dependencies -h | tail -n+2 | head -n-3;
#
# @_include_value_options rapids-make-pip-dependencies -h;
Expand All @@ -23,13 +22,12 @@ make_pip_env() {
local -;
set -euo pipefail;

eval "$(_parse_args --take '-f,--force --pre --no-pre --system-site-packages' "${@:2}" <&0)";
eval "$(_parse_args --take '-f,--force --pre --no-pre' "${@:2}" <&0)";

# shellcheck disable=SC1091
. devcontainer-utils-debug-output 'rapids_build_utils_debug' 'make-pip-env';

test ${#pre[@]} -eq 0 && pre=(--pre);
test ${#system_site_packages[@]} -eq 0 && system_site_packages=();

if test -n "${no_pre-}"; then
pre=();
Expand Down Expand Up @@ -58,11 +56,11 @@ make_pip_env() {
cat "${new_env_path}";
echo "";

python -m venv "${system_site_packages[@]}" "${HOME}/.local/share/venvs/${env_name}";
python -m venv "${HOME}/.local/share/venvs/${env_name}";
# shellcheck disable=SC1090
. "${HOME}/.local/share/venvs/${env_name}/bin/activate";
python -m pip install -U pip;
python -m pip install "${pre[@]}" -I -r "${new_env_path}";
python -m pip install "${pre[@]}" -U -r "${new_env_path}";
# If the venv does exist but it's different from the generated one,
# print the diff between the envs and update it
elif ! diff -BNqw "${old_env_path}" "${new_env_path}" >/dev/null 2>&1; then
Expand Down
Loading