From f0b921e325af00fe5d22f70d0952c2f605eb6459 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 1 Apr 2024 17:25:02 -0500 Subject: [PATCH] Use `conda env create --yes` instead of `--force` (#155) conda dropped support for the `--force` flag to `conda env create`. This changes that flag name to `--yes`. See https://github.com/conda/conda/blob/main/CHANGELOG.md#2430-2024-03-12 and https://github.com/rapidsai/miniforge-cuda/pull/63 for more info. Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Ray Douglass (https://github.com/raydouglass) - https://github.com/jakirkham URL: https://github.com/rapidsai/wholegraph/pull/155 --- ci/build_docs.sh | 4 ++-- ci/check_style.sh | 4 ++-- ci/test_clang_tidy.sh | 4 ++-- ci/test_cpp.sh | 2 +- ci/test_python.sh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 698754b28..88774f94a 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. set -euo pipefail @@ -11,7 +11,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 # Temporarily allow unbound variables for conda activation. set +u conda activate docs diff --git a/ci/check_style.sh b/ci/check_style.sh index 0ee6e88e5..d7baa88e8 100755 --- a/ci/check_style.sh +++ b/ci/check_style.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020-2023, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. set -euo pipefail @@ -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/test_clang_tidy.sh b/ci/test_clang_tidy.sh index ca7efc96e..90157c59c 100755 --- a/ci/test_clang_tidy.sh +++ b/ci/test_clang_tidy.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. set -euo pipefail @@ -12,7 +12,7 @@ rapids-dependency-file-generator \ --file_key clang_tidy \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | 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 diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 0dd5626bc..5e150862d 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -14,7 +14,7 @@ rapids-dependency-file-generator \ --file_key test_cpp \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | 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.sh b/ci/test_python.sh index 941ac38fd..0efa5e8e3 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -27,7 +27,7 @@ rapids-dependency-file-generator \ --file_key test_python \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=${ARCH};py=${RAPIDS_PY_VERSION}" | 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