From d76799a0f53ed83838da6e17230d48d99b36050c Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 27 Mar 2024 16:23:16 -0500 Subject: [PATCH 1/2] Use `conda env create --yes` instead of `--force`. (#216) --- ci/build_docs.sh | 2 +- ci/check_style.sh | 2 +- ci/test_cpp.sh | 2 +- ci/test_python.sh | 2 +- ci/test_python_distributed.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 96ff6d2d..f92a2922 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -13,7 +13,7 @@ rapids-dependency-file-generator \ --file_key docs \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${ENV_YAML_DIR}/env.yaml" -rapids-mamba-retry env create --force -f "${ENV_YAML_DIR}/env.yaml" -n docs +rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n docs conda activate docs rapids-print-env diff --git a/ci/check_style.sh b/ci/check_style.sh index fd3c8dd6..e9839026 100755 --- a/ci/check_style.sh +++ b/ci/check_style.sh @@ -13,7 +13,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 08f202e9..8f281dcb 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -15,7 +15,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 conda activate test rapids-print-env diff --git a/ci/test_python.sh b/ci/test_python.sh index fcb483e4..ce7bfbc9 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -15,7 +15,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 conda activate test rapids-print-env diff --git a/ci/test_python_distributed.sh b/ci/test_python_distributed.sh index 48e7c7ba..a704d34a 100755 --- a/ci/test_python_distributed.sh +++ b/ci/test_python_distributed.sh @@ -15,7 +15,7 @@ rapids-dependency-file-generator \ --file_key test_python_distributed \ --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 conda activate test rapids-print-env From 6a71c4d4f29b72f508dc953265111fa6419d92de Mon Sep 17 00:00:00 2001 From: Ray Douglass <3107146+raydouglass@users.noreply.github.com> Date: Fri, 12 Apr 2024 11:06:25 -0400 Subject: [PATCH 2/2] Fix license name (#220) * Fix license name * Update python/distributed-ucxx/pyproject.toml Co-authored-by: Peter Andreas Entschev --------- Co-authored-by: Peter Andreas Entschev --- python/distributed-ucxx/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/distributed-ucxx/pyproject.toml b/python/distributed-ucxx/pyproject.toml index 97dbab0a..8937afd8 100644 --- a/python/distributed-ucxx/pyproject.toml +++ b/python/distributed-ucxx/pyproject.toml @@ -13,7 +13,7 @@ readme = { file = "README.md", content-type = "text/markdown" } authors = [ { name = "NVIDIA Corporation" }, ] -license = { text = "Apache-2.0" } +license = { text = "BSD-3-Clause" } requires-python = ">=3.9" dependencies = [ "numba>=0.57.1",