From d8f1ecc0613b23199841435be3e66591f157a843 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 27 Mar 2024 11:12:45 -0500 Subject: [PATCH] Use `conda env create --yes` instead of `--force` --- CONTRIBUTING.md | 2 +- ci/build_docs.sh | 2 +- ci/check_style.sh | 2 +- ci/run_clang_tidy.sh | 2 +- ci/test_cpp.sh | 2 +- ci/test_notebooks.sh | 2 +- ci/test_python_common.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 32ae5db329..ca58897be7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -144,7 +144,7 @@ methods to run clang-tidy on your local machine: using Docker or Conda. 1. Navigate to the repository root directory. 2. Create and activate the needed conda environment: ```bash - conda env create --force -n cuml-clang-tidy -f conda/environments/clang_tidy_cuda-118_arch-x86_64.yaml + conda env create --yes -n cuml-clang-tidy -f conda/environments/clang_tidy_cuda-118_arch-x86_64.yaml conda activate cuml-clang-tidy ``` 3. Generate the compile command database with diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 2969dfdc6b..9fe310a49a 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -10,7 +10,7 @@ rapids-dependency-file-generator \ --file_key docs \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml -rapids-mamba-retry env create --force -f env.yaml -n docs +rapids-mamba-retry env create --yes -f env.yaml -n docs conda activate docs rapids-print-env diff --git a/ci/check_style.sh b/ci/check_style.sh index 0ee6e88e58..58cc1b944a 100755 --- a/ci/check_style.sh +++ b/ci/check_style.sh @@ -11,7 +11,7 @@ rapids-dependency-file-generator \ --file_key checks \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml -rapids-mamba-retry env create --force -f env.yaml -n checks +rapids-mamba-retry env create --yes -f env.yaml -n checks conda activate checks # Run pre-commit checks diff --git a/ci/run_clang_tidy.sh b/ci/run_clang_tidy.sh index 10c3347f6b..e2c2d3ed1e 100755 --- a/ci/run_clang_tidy.sh +++ b/ci/run_clang_tidy.sh @@ -11,7 +11,7 @@ rapids-dependency-file-generator \ --file_key clang_tidy \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml -rapids-mamba-retry env create --force -f env.yaml -n clang_tidy +rapids-mamba-retry env create --yes -f env.yaml -n clang_tidy # Temporarily allow unbound variables for conda activation. set +u && conda activate clang_tidy && set -u diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 04d5770d4b..02cd1467d1 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -18,7 +18,7 @@ rapids-dependency-file-generator \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" \ --prepend-channels "${CPP_CHANNEL}" | tee env.yaml -rapids-mamba-retry env create --force -f env.yaml -n test +rapids-mamba-retry env create --yes -f env.yaml -n test # Temporarily allow unbound variables for conda activation. set +u diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index 8fdff2af4a..5ac4698038 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -15,7 +15,7 @@ rapids-dependency-file-generator \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \ --prepend-channels "${CPP_CHANNEL};${PYTHON_CHANNEL}" | tee env.yaml -rapids-mamba-retry env create --force -f env.yaml -n test +rapids-mamba-retry env create --yes -f env.yaml -n test # Temporarily allow unbound variables for conda activation. set +u diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index c0c454c843..f3277a0c78 100644 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -16,7 +16,7 @@ rapids-dependency-file-generator \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \ --prepend-channels "${CPP_CHANNEL};${PYTHON_CHANNEL}" | tee env.yaml -rapids-mamba-retry env create --force -f env.yaml -n test +rapids-mamba-retry env create --yes -f env.yaml -n test # Temporarily allow unbound variables for conda activation. set +u