From 805bcf1f6926c154d5ff00b0ed0e9c63f7437cc5 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 30 May 2024 08:18:13 -0500 Subject: [PATCH] ensure update-version.sh preserves alpha specs (#1572) Contributes to https://github.com/rapidsai/build-planning/issues/31 Follow-up to #1502 * ensures that `update-version.sh` does not remove alpha specs like `,>=0.0.0a0` in `pyproject.toml` and conda environment files * consolidates `rapids-build-backend` versions in `dependencies.yaml` - *since I was pushing a new commit here anyway, figured I'd take the opportunity to include that simplification recommended in https://github.com/rapidsai/cudf/pull/15245#discussion_r1617724287* Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Kyle Edwards (https://github.com/KyleFromNVIDIA) - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/rmm/pull/1572 --- ci/release/update-version.sh | 4 ++-- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-122_arch-x86_64.yaml | 2 +- dependencies.yaml | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index dfb0c17b0..fb779048c 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -53,9 +53,9 @@ DEPENDENCIES=( ) for DEP in "${DEPENDENCIES[@]}"; do for FILE in dependencies.yaml conda/environments/*.yaml; do - sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" "${FILE}" + sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}" done for FILE in python/*/pyproject.toml; do - sed_runner "/\"${DEP}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*\"/g" "${FILE}" + sed_runner "/\"${DEP}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0\"/g" "${FILE}" done done diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index cb2d68d21..7c79d41b7 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -33,7 +33,7 @@ dependencies: - pytest - pytest-cov - python>=3.9,<3.12 -- rapids-build-backend >=0.3.0,<0.4.0.dev0 +- rapids-build-backend>=0.3.0,<0.4.0.dev0 - scikit-build-core >=0.7.0 - spdlog>=1.12.0,<1.13 - sphinx diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index d5fe64a52..efce3b84c 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -32,7 +32,7 @@ dependencies: - pytest - pytest-cov - python>=3.9,<3.12 -- rapids-build-backend >=0.3.0,<0.4.0.dev0 +- rapids-build-backend>=0.3.0,<0.4.0.dev0 - scikit-build-core >=0.7.0 - spdlog>=1.12.0,<1.13 - sphinx diff --git a/dependencies.yaml b/dependencies.yaml index d112b3ba6..eba0d609b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -92,13 +92,14 @@ channels: dependencies: rapids_build_skbuild: common: + - output_types: [conda, requirements, pyproject] + packages: + - rapids-build-backend>=0.3.0,<0.4.0.dev0 - output_types: conda packages: - - rapids-build-backend >=0.3.0,<0.4.0.dev0 - scikit-build-core >=0.7.0 - output_types: [requirements, pyproject] packages: - - rapids-build-backend>=0.3.0,<0.4.0.dev0 - scikit-build-core[pyproject]>=0.7.0 build: common: