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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Feb 13, 2024
Merged

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

merged 1 commit into from
Feb 13, 2024
+1 −2

Conversation

GPUtester
Copy link
Collaborator

Forward-merge triggered by push to branch-24.02 that creates a PR to keep branch-24.04 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge.

@raydouglass
Unpin numba<0.58 (#15031)
ac438c4 
I think unpinning `numba` in the conda recipe was just missed in #14616.

I discovered this issue [trying to build the `24.02` release](https://github.com/rapidsai/cudf/actions/runs/7878153691/job/21496377912#step:7:1674).

PRs & nightly builds are working because the `rapidsai-nightly` channel has an older version of `pynvjitlink` that supported `numba>=0.57` whereas the `rapidsai` channel only has the latest version which pins to `numba>=0.58`.

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

Approvers:
   - Vyas Ramasubramani (https://github.com/vyasr)
   - Bradley Dice (https://github.com/bdice)
@GPUtester GPUtester requested a review from a team as a code owner February 13, 2024 14:31
@GPUtester
Copy link
Collaborator Author

FAILURE - Unable to forward-merge due to conflicts, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/
IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the /merge comment). Instead, an admin must manually merge by changing the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

@github-actions github-actions bot added the conda label Feb 13, 2024
@codecov Codecov
Copy link

codecov bot commented Feb 13, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (f281b90) 85.90% compared to head (ac438c4) 86.01%.
Report is 58 commits behind head on branch-24.04.

Additional details and impacted files 
@@               Coverage Diff                @@
##           branch-24.04   #15037      +/-   ##
================================================
+ Coverage         85.90%   86.01%   +0.10%     
================================================
  Files               175      175              
  Lines             27428    27400      -28     
================================================
+ Hits              23562    23567       +5     
+ Misses             3866     3833      -33

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jakirkham
Copy link
Member

Conflict is due to the change from PR: #14892

@raydouglass raydouglass merged commit 2e17a40 into branch-24.04 Feb 13, 2024
103 checks passed
@jakirkham
Copy link
Member

Handled in PR: #15039

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@GPUtester @jakirkham @raydouglass