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-23.06 into branch-23.08 #1190

Merged

Conversation

raydouglass
Copy link
Member

Resolves conflicts in #1189

raydouglass and others added 2 commits June 7, 2023 13:27
Updates `update-version.sh` to follow the pattern from rapidsai/cugraph#3638

Required for `23.06` because `python/cuspatial/pyproject.py` does not exist thus breaking the script. This means any hotfixes to this version will have issues during release.

Also updates a version in `cpp/doxygen/Doxyfile` which was outdated.

Skipped CI since this script is not tested by CI.

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

Approvers:
   - AJ Schmidt (https://github.com/ajschmidt8)
@raydouglass raydouglass added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Jun 7, 2023
@raydouglass raydouglass requested a review from a team as a code owner June 7, 2023 17:39
@raydouglass raydouglass self-assigned this Jun 7, 2023
@github-actions github-actions bot added the ci label Jun 7, 2023
@bdice
Copy link
Contributor

bdice commented Jun 7, 2023

Thanks @raydouglass! Looks good to me.

@raydouglass raydouglass merged commit 0c395d1 into rapidsai:branch-23.08 Jun 7, 2023
4 checks passed
@raydouglass raydouglass deleted the branch-23.08-merge-23.06 branch June 7, 2023 18:07
@raydouglass raydouglass restored the branch-23.08-merge-23.06 branch June 7, 2023 18:10
@raydouglass raydouglass deleted the branch-23.08-merge-23.06 branch June 7, 2023 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
Status: Todo
Development

Successfully merging this pull request may close these issues.

None yet

3 participants