Skip to content

Forward-merge branch-23.06 to branch-23.08#481

Merged
ajschmidt8 merged 3 commits intobranch-23.08from
branch-23.06
Jun 1, 2023
Merged

Forward-merge branch-23.06 to branch-23.08#481
ajschmidt8 merged 3 commits intobranch-23.08from
branch-23.06

Conversation

@GPUtester
Copy link
Copy Markdown
Contributor

Forward-merge triggered by push to branch-23.06 that creates a PR to keep branch-23.08 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.

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: #479
@GPUtester GPUtester requested review from a team as code owners May 31, 2023 16:41
@GPUtester
Copy link
Copy Markdown
Contributor 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: Before merging and approving this PR, be sure to change the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

jakirkham and others added 2 commits May 31, 2023 19:08
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: #480
…e every week (#478)

Based on the discussion in #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: #478
@github-actions github-actions bot added the ci label May 31, 2023
@ajschmidt8 ajschmidt8 merged commit c17e0d0 into branch-23.08 Jun 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants