Skip to content

Commit

Permalink
ensure update-version.sh preserves alpha specs (#1572)
Browse files Browse the repository at this point in the history
Contributes to rapidsai/build-planning#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 rapidsai/cudf#15245 (comment)

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)
  - Bradley Dice (https://github.com/bdice)

URL: #1572
  • Loading branch information
jameslamb authored May 30, 2024
1 parent 15c0466 commit 805bcf1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-122_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 805bcf1

Please sign in to comment.