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

Forward-merge branch-24.02 to branch-24.04 #636

Merged

Conversation

jakirkham
Copy link
Member

@jakirkham jakirkham commented Mar 4, 2024

xref: #626

Fixes #630 (as this contains the Dask-SQL 2024.1.0 update already)

raydouglass and others added 4 commits February 1, 2024 14:55
Fixes attempted in rapidsai/integration#695 & rapidsai/integration#697 don't play well with CEC at large, but this repo can pin `cuda-python` more restrictively.

This PR pins `cuda-python` to the CUDA `major.minor.*` version.

See also conda-forge/cuda-python-feedstock#66

Authors:
  - Ray Douglass (https://github.com/raydouglass)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Jake Awe (https://github.com/AyodeAwe)

URL: rapidsai#624
Looks like all occurences of `DASK_SQL_VER` use the full version tag - should we modify [the logic in the version updating workflow](https://github.com/charlesbluca/docker/blob/12323a46f1a05f80d1e9354b3dbc0e3937227cc4/.github/workflows/update-dask-sql.yml#L49-L53) to reflect this?

Authors:
  - Charles Blackmon-Luca (https://github.com/charlesbluca)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)

URL: rapidsai#623
Now that `cuda-python` packaging has been fixed to enable CUDA Enhanced Compatibility in conda-forge/cuda-python-feedstock#67, we can unpin `cuda-python` in our Docker builds. This reverts commit 7c808e7.

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)

URL: rapidsai#628
@jakirkham jakirkham requested a review from a team as a code owner March 4, 2024 21:46
@jakirkham
Copy link
Member Author

/merge

@rapids-bot rapids-bot bot merged commit 9732fb4 into rapidsai:branch-24.04 Mar 5, 2024
18 checks passed
@jakirkham jakirkham deleted the branch-24.04-merge-24.02 branch March 5, 2024 01:21
@jakirkham
Copy link
Member Author

Oops this squashed merged 🤦‍♂️

Fixing with PR: #637

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants