Skip to content

Commit

Permalink
try excluding breathe from conda env
Browse files Browse the repository at this point in the history
  • Loading branch information
jameslamb committed Dec 24, 2024
1 parent f1721fd commit 7ca20b8
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion features/src/rapids-build-utils/devcontainer-feature.json
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": "25.2.3",
"version": "25.2.4",
"description": "A feature to install the RAPIDS devcontainer build utilities",
"containerEnv": {
"BASH_ENV": "/etc/bash.bash_env"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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.
#
Expand All @@ -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.
Expand Down Expand Up @@ -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:-}";
Expand Down

0 comments on commit 7ca20b8

Please sign in to comment.