Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

handle more RAPIDS version formats in update-version.sh, refactor dependencies.yaml #174

Merged
merged 15 commits into from
Jan 25, 2024

Conversation

jameslamb
Copy link
Member

Contributes to rapidsai/build-planning#13.

Updates update-version.sh to correctly handle RAPIDS dependencies like cudf-cu12==24.2.*.

This also pulls in some dependency refactoring originally added in #161, which allows greater use of dependencies.yaml globs (and therefore less maintenance effort to support new CUDA versions).

How I tested this

The portability of this updated sed command was tested here: rapidsai/cudf#14825 (comment).

In this repo, I ran the following:

./ci/release/update-version.sh '0.36.00'
git diff

./ci/release/update-version.sh '0.37.00
git diff

Confirmed that that first git diff changed all the things I expected, and that second one showed 0 changes.

@jameslamb jameslamb added improvement Improves an existing functionality non-breaking Introduces a non-breaking change bug Something isn't working and removed improvement Improves an existing functionality labels Jan 23, 2024
dependencies.yaml Outdated Show resolved Hide resolved
@bdice
Copy link
Contributor

bdice commented Jan 24, 2024

I included some changes that we know are needed for #167 / #171. The changes in b0142c2 will reduce merge conflicts as we continue with multiple work streams (adding CUDA 12.2, fixing branch updates, adding wheels).

@jameslamb
Copy link
Member Author

I included some changes that we know are needed for #167 / #171

These all look good to me, thanks @bdice

@jakirkham
Copy link
Member

It looks like some conflicts crept in here. Maybe these files need to be regenerated with rapids-dependency-file-generator

@jakirkham
Copy link
Member

Have resolved conflicts with PR ( #164 )

@jakirkham jakirkham self-requested a review January 25, 2024 02:03
Copy link
Member

@jakirkham jakirkham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we are moving to rapids-dask-dependency in this PR, think we should update the Conda recipes as well. In particular am noticing these lines here

- dask >=2023.9.2
- distributed >=2023.9.2

@jameslamb
Copy link
Member Author

As we are moving to rapids-dask-dependency in this PR, think we should update the Conda recipes as well. In particular am noticing these lines here

@jakirkham I just did that in 20a86a4

I don't see any other uses of dask or distributed that need to be replaced.

@jameslamb jameslamb requested a review from jakirkham January 25, 2024 15:43
@jameslamb
Copy link
Member Author

whoops that needs to be a RAPIDS version not UCX's version

The reported errors are:
- Encountered problems while solving:
-   - nothing provides rapids-dask-dependency 0.37.* needed by distributed-ucxx-0.37.00a-py3.10_240125_g20a86a4_18

(build link)

Will fix that momentarily.

Copy link
Member

@jakirkham jakirkham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks James! 🙏

@jameslamb jameslamb requested a review from a team as a code owner January 25, 2024 17:42
@bdice
Copy link
Contributor

bdice commented Jan 25, 2024

I noticed a small issue, rapids-dask-dependency was pinned as =24.4 while update-version.sh would pin it as =24.04. Then I re-ran ci/release/update-version.sh 0.37.00 and realized that there were a bunch of problems from the docs PR #164 not aligning with update-version.sh, and PRs targeting branch-0.36 that were not updated for branch-0.37 (they were merged after branch-0.37 was created). I pushed e06b20c to fix these issues. Sorry for the late change - I know we want to get this merged soon, but this felt sufficiently related to fix in this PR.

@jameslamb
Copy link
Member Author

Sorry for the late change - I know we want to get this merged soon, but this felt sufficiently related to fix in this PR.

Totally fine, thanks for that! I hadn't noticed it.

@jakirkham
Copy link
Member

Thanks Bradley! 🙏

Had missed that

@jakirkham
Copy link
Member

/merge

@rapids-bot rapids-bot bot merged commit ed7c281 into rapidsai:branch-0.37 Jan 25, 2024
20 checks passed
@jakirkham
Copy link
Member

Thanks all! 🙏

@jameslamb jameslamb deleted the update-version branch January 25, 2024 20:25
@jameslamb jameslamb mentioned this pull request Jan 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working non-breaking Introduces a non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants