Skip to content

Commit 35f818b

Browse files
authored
Use conda env create --yes instead of --force (#15403)
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 rapidsai/miniforge-cuda#63 for more info.
1 parent e3cbf62 commit 35f818b

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

ci/build_docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rapids-dependency-file-generator \
1717
--file_key docs \
1818
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${ENV_YAML_DIR}/env.yaml"
1919

20-
rapids-mamba-retry env create --force -f "${ENV_YAML_DIR}/env.yaml" -n docs
20+
rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n docs
2121
conda activate docs
2222

2323
rapids-print-env

ci/check_style.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ rapids-dependency-file-generator \
1313
--file_key checks \
1414
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${ENV_YAML_DIR}/env.yaml"
1515

16-
rapids-mamba-retry env create --force -f "${ENV_YAML_DIR}/env.yaml" -n checks
16+
rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n checks
1717
conda activate checks
1818

1919
RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"

ci/test_cpp_common.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
2+
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
33

44
set -euo pipefail
55

@@ -14,7 +14,7 @@ rapids-dependency-file-generator \
1414
--file_key test_cpp \
1515
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee "${ENV_YAML_DIR}/env.yaml"
1616

17-
rapids-mamba-retry env create --force -f "${ENV_YAML_DIR}/env.yaml" -n test
17+
rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n test
1818

1919
# Temporarily allow unbound variables for conda activation.
2020
set +u

ci/test_java.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
2+
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
33

44
set -euo pipefail
55

@@ -14,7 +14,7 @@ rapids-dependency-file-generator \
1414
--file_key test_java \
1515
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee "${ENV_YAML_DIR}/env.yaml"
1616

17-
rapids-mamba-retry env create --force -f "${ENV_YAML_DIR}/env.yaml" -n test
17+
rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n test
1818

1919
export CMAKE_GENERATOR=Ninja
2020

ci/test_notebooks.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2020-2023, NVIDIA CORPORATION.
2+
# Copyright (c) 2020-2024, NVIDIA CORPORATION.
33

44
set -euo pipefail
55

@@ -14,7 +14,7 @@ rapids-dependency-file-generator \
1414
--file_key test_notebooks \
1515
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${ENV_YAML_DIR}/env.yaml"
1616

17-
rapids-mamba-retry env create --force -f "${ENV_YAML_DIR}/env.yaml" -n test
17+
rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n test
1818

1919
# Temporarily allow unbound variables for conda activation.
2020
set +u

ci/test_python_common.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
2+
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
33

44
# Common setup steps shared by Python test jobs
55

@@ -16,7 +16,7 @@ rapids-dependency-file-generator \
1616
--file_key test_python \
1717
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${ENV_YAML_DIR}/env.yaml"
1818

19-
rapids-mamba-retry env create --force -f "${ENV_YAML_DIR}/env.yaml" -n test
19+
rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n test
2020

2121
# Temporarily allow unbound variables for conda activation.
2222
set +u

0 commit comments

Comments
 (0)