Skip to content

Commit 064e254

Browse files
authored
consolidate cuda_suffixed=false blocks in dependencies.yaml, fix update-version.sh (#1367)
Contributes to rapidsai/build-planning#31. Follow-up to #1364. Implements some of the suggestions made in rapidsai/cudf#16183 (after #1364 was already merged): * removing `cuda_suffixed: "false"` blocks in `dependencies.yaml` wherever they're identical to each other and the fallback matrix * changing `dependencies.yaml` anchors with names like `*_conda` to `*_unsuffixed`, to reflect the fact that they're not conda-specific * checking that `update-version.sh` catches all changes to versions ## Notes for Reviewers ### How I tested this Looked for `update-versions.sh` issues manually like this: ```shell git fetch upstream --tags ci/release/update-version.sh '24.10.0' git grep -E '24\.8|24\.08|0\.39' ``` The did find a few problems (like UCX dependency versions not being updated). This fixes those issues. Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Bradley Dice (https://github.com/bdice) - Vyas Ramasubramani (https://github.com/vyasr) URL: #1367
1 parent 13a5f47 commit 064e254

File tree

2 files changed

+23
-24
lines changed

2 files changed

+23
-24
lines changed

ci/release/update-version.sh

+15-2
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,23 @@ DEPENDENCIES=(
4545
kvikio
4646
rapids-dask-dependency
4747
)
48-
for FILE in dependencies.yaml conda/environments/*.yaml; do
49-
for DEP in "${DEPENDENCIES[@]}"; do
48+
for DEP in "${DEPENDENCIES[@]}"; do
49+
for FILE in dependencies.yaml conda/environments/*.yaml; do
5050
sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}"
5151
done
52+
sed_runner "/\"${DEP}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0\"/g" pyproject.toml
53+
done
54+
55+
UCX_DEPENDENCIES=(
56+
distributed-ucxx
57+
ucx-py
58+
ucxx
59+
)
60+
for DEP in "${UCX_DEPENDENCIES[@]}"; do
61+
for FILE in dependencies.yaml conda/environments/*.yaml; do
62+
sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_UCXPY_VERSION}.*,>=0.0.0a0/g" "${FILE}"
63+
done
64+
sed_runner "/\"${DEP}==/ s/==.*\"/==${NEXT_UCXPY_VERSION}.*,>=0.0.0a0\"/g" pyproject.toml
5265
done
5366

5467
# CI files

dependencies.yaml

+8-22
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@ dependencies:
168168
- pytest-cov
169169
- output_types: [conda]
170170
packages:
171-
- &cudf_conda cudf==24.8.*,>=0.0.0a0
172-
- &dask_cudf_conda dask-cudf==24.8.*,>=0.0.0a0
171+
- &cudf_unsuffixed cudf==24.8.*,>=0.0.0a0
172+
- &dask_cudf_unsuffixed dask-cudf==24.8.*,>=0.0.0a0
173173
- distributed-ucxx==0.39.*,>=0.0.0a0
174-
- &kvikio_conda kvikio==24.8.*,>=0.0.0a0
175-
- &ucx_py_conda ucx-py==0.39.*,>=0.0.0a0
174+
- &kvikio_unsuffixed kvikio==24.8.*,>=0.0.0a0
175+
- &ucx_py_unsuffixed ucx-py==0.39.*,>=0.0.0a0
176176
- ucx-proc=*=gpu
177177
- ucxx==0.39.*,>=0.0.0a0
178178
specific:
@@ -197,30 +197,16 @@ dependencies:
197197
- cudf-cu12==24.8.*,>=0.0.0a0
198198
- dask-cudf-cu12==24.8.*,>=0.0.0a0
199199
- ucx-py-cu12==0.39.*,>=0.0.0a0
200-
- matrix:
201-
cuda: "12.*"
202-
cuda_suffixed: "false"
203-
packages:
204-
- *cudf_conda
205-
- *dask_cudf_conda
206-
- *ucx_py_conda
207200
- matrix:
208201
cuda: "11.*"
209202
cuda_suffixed: "true"
210203
packages:
211204
- cudf-cu11==24.8.*,>=0.0.0a0
212205
- dask-cudf-cu11==24.8.*,>=0.0.0a0
213206
- ucx-py-cu11==0.39.*,>=0.0.0a0
214-
- matrix:
215-
cuda: "11.*"
216-
cuda_suffixed: "false"
217-
packages:
218-
- *cudf_conda
219-
- *dask_cudf_conda
220-
- *ucx_py_conda
221207
- matrix:
222208
packages:
223-
- *cudf_conda
224-
- *dask_cudf_conda
225-
- *kvikio_conda
226-
- *ucx_py_conda
209+
- *cudf_unsuffixed
210+
- *dask_cudf_unsuffixed
211+
- *kvikio_unsuffixed
212+
- *ucx_py_unsuffixed

0 commit comments

Comments
 (0)