From dad2c2eb31763f88ca3e4e9e9db1a7798f343476 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 1 Apr 2024 20:41:37 -0500 Subject: [PATCH] Use `conda env create --yes` instead of `--force` (#4286) 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/cugraph/pull/4286 --- ci/build_docs.sh | 2 +- ci/check_style.sh | 4 ++-- ci/test_cpp.sh | 2 +- ci/test_notebooks.sh | 4 ++-- ci/test_python.sh | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 8e7cfc2c4b..9b72c98f1b 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -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 conda activate docs rapids-print-env diff --git a/ci/check_style.sh b/ci/check_style.sh index be3ac3f4b8..af4ccb2bab 100755 --- a/ci/check_style.sh +++ b/ci/check_style.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020-2022, 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_cpp.sh b/ci/test_cpp.sh index 2cd7d02670..ce7425d67b 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_notebooks.sh b/ci/test_notebooks.sh index 653f23f947..29e65e5f4c 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020-2023, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. set -Eeuo pipefail @@ -11,7 +11,7 @@ rapids-dependency-file-generator \ --file_key test_notebooks \ --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 diff --git a/ci/test_python.sh b/ci/test_python.sh index 3a47d7e149..576336f6b4 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -14,7 +14,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 @@ -141,7 +141,7 @@ if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then # we are only testing in a single cuda version # because of pytorch and rapids compatibilty problems - rapids-mamba-retry env create --force -f env.yaml -n test_cugraph_dgl + rapids-mamba-retry env create --yes -f env.yaml -n test_cugraph_dgl # activate test_cugraph_dgl environment for dgl set +u @@ -187,7 +187,7 @@ fi if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then - rapids-mamba-retry env create --force -f env.yaml -n test_cugraph_pyg + rapids-mamba-retry env create --yes -f env.yaml -n test_cugraph_pyg # Temporarily allow unbound variables for conda activation. set +u