fix Auto-merge: Branch 23.08 merge 23.06 #482
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR: - fixes a couple of tests which were failing due to recent changes, leading to aggregate results being unsorted - resolves docs build failures, which were caused by datashader rendering issues with latest numpy(1.24.3), fixed by adding a pin for numpy (<1.24, similar to the version pins in cugraph). @ajschmidt8, could you check if adding this version pin is fine? Authors: - Ajay Thorve (https://github.com/AjayThorve) Approvers: - Allan (https://github.com/exactlyallan) - Ray Douglass (https://github.com/raydouglass) URL: rapidsai#479
Align with the rest of RAPIDS on these requirements. Also needed for CUDA 12 support. Authors: - https://github.com/jakirkham - Ajay Thorve (https://github.com/AjayThorve) Approvers: - Ray Douglass (https://github.com/raydouglass) - Ajay Thorve (https://github.com/AjayThorve) URL: rapidsai#480
…e every week (rapidsai#478) Based on the discussion in rapidsai#452, adding a weekly schedule to run the external dependency testing workflow. cc @exactlyallan @ajschmidt8 Authors: - Ajay Thorve (https://github.com/AjayThorve) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) URL: rapidsai#478
19ff4e1 to
30f54a7
Compare
30f54a7 to
31cf579
Compare
|
@AjayThorve, it looks like a merge conflict turned up. Can you rebase to pull in the latest changes? |
31cf579 to
f27b2c5
Compare
done |
|
@AjayThorve, I don't think that worked as intended. This PR should have one more commit than the number of commits in the conflicted PR (#481). Since that PR has 3 commits, this PR should have those commits plus one more commit for the merge conflicts (so 4 total commits). |
f27b2c5 to
5a46979
Compare
5a46979 to
c17e0d0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Manually resolve conflicts in the auto-merge PR #481